Merge branches 'UiBuildingSelect' and 'master' of https://github.com/mbeck5/GU_Energy_Dashboard into UiBuildingSelect

Conflicts:
	client/app/index.html