Bankine
Merge branch 'master' of https://github.com/valkirilov/RoomTaken

Conflicts:
	SPA/app/js/services/ResourceSevice.js