Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/app/dashboards/default.json
	src/app/panels/bettermap/module.js
	src/app/panels/table/module.html
	src/app/panels/table/module.js