Merge branch 'refs/heads/master' into develop
Makefile: generate source maps for minified files
Makefile: create source maps
Combined, minified, gzipped and mapped
Merge branch 'refs/heads/develop'