* Updated backend
Merge branch 'develop' of github.com:SaltySoft/happy_hours into develop

Conflicts:
	HhBackend/web.config
* Corrected backend edmx