using rollback
Merge branch 'master' of https://github.com/vedangdate/angular-seed-master

Conflicts:
	app/js/controllers/EventController.js
	app/js/services/EventData.js