add photoalbum in events
Merge branch 'feature/event_edit_new-42' into staging

Conflicts:
	app/models/event.rb
	db/schema.rb