Merge branch 'master' of https://github.com/adaniels21487/librenms into issue-1650

Conflicts:
	html/api_v0.php
	html/includes/api_functions.inc.php

sql-schema/083.sql

@@ -0,0 +1 @@
+INSERT INTO widgets VALUES (NULL, 'External Images', 'generic-image', '5,4');

sql-schema/084.sql

@@ -0,0 +1 @@
+ALTER TABLE  `users` ADD  `dashboard` INT( 11 ) DEFAULT 0 NOT NULL;