fix hierarchy controllers
fix controllers hierarchy
fix test for new controller hierarchy
fix paths for new hierarchy controllers
fix locales
add draper
add decorator for instructor
update rails to 3.2.11
Merge branch 'feature/refactoring_#25' into staging

Conflicts:
	app/views/web/categories/unions/groups/show.html.haml
	config/locales/custom.ru.yml
	config/routes.rb