Fixed failed commit
Merge branch 'master' of https://github.com/TelerikHackathon2014/MobileApplication

Conflicts:
	Hackathon Mobile Client/controllers/RestaurantCtrl.js
	Hackathon Mobile Client/templates/restaurants-list.html