Added events
Merge branch 'events'

Conflicts:
	app/assets/stylesheets/admin/main.css.scss
Resolved conflict