gfgfdgfdgdfgfdgd
Merge branch 'master' of https://github.com/gzbbdg/displayboardinfo

Conflicts:
	web-app/js/ng-app/controllers/DashboardController.js