Merge branch 'hotfix/1.4.1' into develop
Initial conversion of erb to haml.
Massive update to Rails 4.1

Included in this update is a major refactor of the themes.
Reimplemented a couple removed gems.
Merge branch 'release/1.5'