Switch main app to minified version
Merge branch 'master' into tags