BZ-10463: Migrate Yellowfin dashboards to the bootstrap site
Merge branch 'master' of https://github.com/NoesisEnergy/bootstrap

Conflicts:
	src/main/js/noesis/bootstrap/dashboard/controllers/dashboardController.js