Dont minify any of the source code, except for js libraries
Merge branch 'trunk'