Merge branch 'master' of https://github.com/grammaright/evezaryEvent

Conflicts:
	app/assets/javascripts/mobileScript.js
Merge branch 'master' of https://github.com/onesup/evezaryEvent

Conflicts:
	app/assets/javascripts/mobileScript.js