COR S
Merge branch 'master' of https://github.com/TelerikHackathon2014/MobileApplication

Conflicts:
	Hackathon Mobile Client/templates/home.html