Adding Restangylar do project
Getting ready for merge
Merge branch 'restangular' into develop

Conflicts:
	app/js/controllers.js