Merge branch 'hotfix/0.10.4'

* hotfix/0.10.4:
  * Fixed issue with detailed education (backported from bs3 branch) * Updated gems
* Rails 3.2.18
* Updated gems
Merge branch 'hotfix/0.10.5' into develop

* hotfix/0.10.5:
  * Rails 3.2.18 * Updated gems