fix partners and events
helper for title
refactoring
fix locale
commit
add colorbox test
Merge branch 'develop' of github.com:kaize/castle into feature/edit_photo_at_news-59
fixes
redacting news
photo left in text
add comments for photo albums
fixes view photo_albums
fixes view partners
Merge branch 'develop' of github.com:kaize/castle into feature/partner_url-54

Conflicts:
	app/views/layouts/web/shared/_partners.html.haml
fixes partners
fixes patrners
add css for partners
refactoring
photo album edit view
Merge branch 'feature/fix_bug_title_admin-33' into develop

Conflicts:
	app/views/layouts/web/admin/application.html.haml
	config/locales/custom.ru.yml