Commit from KRASIIIII
Merge branch 'master' of https://github.com/valkirilov/RoomTaken

Conflicts:
	SPA/app/index.html
	SPA/app/partials/free-rooms-list.html
Some changes