Merge branch 'hotfix/0.1.2'
Fixed a problem with the AccountController
Merge branch 'hotfix/0.1.3' into develop