edit events
edit events
fix event view
fixes all_events
add showfor events
add view show for events
add social buttons
fix albums show page
add photoalbum in events
Merge branch 'feature/albums-94' into develop

Conflicts:
	app/views/web/photo_albums/show.html.haml
fixes bug 106
fixes study_request bug 106
Merge branch 'feature/event_edit_new-42' into develop

Conflicts:
	app/controllers/web/categories/unions/groups_controller.rb
	app/models/event.rb
	app/repository/event_repository.rb
	db/schema.rb
fixes published/hidden news
fixes pages bug 100
Merge branch 'develop' of github.com:kaize/castle into feature/menu-104

Conflicts:
	app/controllers/web/page_controller.rb
	app/models/page.rb
add show menu_items in navigation
add nav for pages