Merge branch 'hotfix/0.1.3' into appsembler_master
revert template changes
Merge branch 'hotfix/0.1.4' into appsembler_develop