Merge remote-tracking branch 'origin/master'

Conflicts:
	app/dashboard-hped/dashboard.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/dashboard-hped/dashboard.html