Merge branch 'hotfix/1.5'
Version raised.
Haml gem changed.
Merge branch 'hotfix/1.6' into develop
Merge branch 'develop' of https://github.com/jasperkennis/TNW-Presents into develop