refactor if with one root aggregation
Merge branch 'feature/refactoring_#25' into develop

Conflicts:
	app/views/web/categories/unions/groups/show.html.haml
	config/locales/custom.ru.yml
	config/routes.rb
remove model from can_view?
Merge branch 'feature/photoalbum_#35' into develop

Conflicts:
	Gemfile
	config/locales/custom.ru.yml
fixes #44
Merge branch 'feature/fix_bug_photo-44' of github.com:kaize/castle into staging

Conflicts:
	config/locales/custom.ru.yml