Merge branch 'hotfix/0.2.14' into appsembler_master
refactoring of compress tags in base.html
Merge branch 'hotfix/0.2.15' into appsembler_develop