Merge branch 'hotfix/0.1.2-encryption'
Testing to commit something else and push it to production
Merge branch 'master' of heroku.com:desktoolbelt
Reverted the previous changes.
Merge branch 'release/v0.1.3'
Merge branch 'release/v0.1.4'
moved requirejs out of the assets group
assets stuff
Some more asset stuff before we can push it to production.
changed application.js.coffee to main.js.coffee
updated the change log for v0.1.5
Merge branch 'release/v0.1.5'
Merge branch 'release/v0.1.5' into develop
Merge branch 'master' into develop