Merge branch 'hotfix/languages'
Merge branch 'dev'
Merge branch 'dev'
Use before filters to find Solutions for SolutionsController methods
Merge branch 'master' of ssh://personal/codeflash/codeflash
Merge branch 'master' into dev
used before_filter for profile
Merge branch 'dev' into feature/ui