push
Merge branch 'master' of https://github.com/kpourdeilami/eventApp

Conflicts:
	www/js/app.js
	www/partials/createEvent.html
	www/partials/home.html