some bugfixes for build script
Merge branch 'master' into build
moved around some stuff for build. counting on gzip not on minifying
added
Merge branch 'master' into build