Commit missing files
Clean up
Clean up controller
fix
Clean up.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	WebApplication1-Test-FlexOffer/WebAPI-FlexOffer.csproj
	WebApplication1-Test-FlexOffer/js/directives/plusMinusButtonDirective.js
	WebApplication1-Test-FlexOffer/js/directives/tempSettingsDirective.js
	app/js/controllers/FlexOfferCtrl.js
	app/js/controllers/FlexOfferCtrl.js.map
	app/js/controllers/comfortSettingsCtrl.js
	app/js/controllers/comfortSettingsCtrl.js.map
	app/js/controllers/heatPumpCtrl.js
	app/js/controllers/heatPumpCtrl.js.map
	app/js/controllers/mainNavCtrl.js
	app/js/controllers/mainNavCtrl.js.map
	app/js/controllers/temperatureCtrl.js
	app/js/controllers/temperatureCtrl.js.map
	app/js/directives/ExampleBarDirective.js
	app/js/directives/ExampleBarDirective.js.map
	app/js/directives/currentTime.js
	app/js/directives/currentTime.js.map
	app/js/directives/currentTimeDirective.js
	app/js/directives/currentTimeDirective.js.map
	app/js/directives/flexOfferBarDirective.js
	app/js/directives/flexOfferBarDirective.js.map
	app/js/directives/sunPopoverDirective.js
	app/js/directives/tempSettingsDirective.js
	app/js/directives/tempSettingsDirective.js.map
	app/js/directives/temperaturBarDirective.js
	app/js/directives/temperaturBarDirective.js.map
	app/js/directives/viewDirective.js
	app/js/directives/viewDirective.js.map
	app/js/factories/dataFactory.ts