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

Conflicts:
	client/app/scripts/controllers/buildingSelector.js
	client/app/views/buildingSelector.html
Merge pull request #5 from mbeck5/UiBuildingSelect

Ui building select