Commit after merge from upstream
Merge branch 'master' of https://github.com/Sowmya32/jEvents

Conflicts:
	app/views/layouts/application.html.erb