Merge branch 'hotfix/0.1.5' into appsembler_develop
Merge branch 'hotfix/0.1.6' into appsembler_develop
temp fix for taxonomy styling issue
Merge branch 'refs/heads/appsembler_develop' into feature/136-profile