Added Gulp.js, but usemin part is missing
Merge branch 'master' into e2e-zombie

Conflicts:
	package.json
Merge branch 'e2e-zombie' of github.com:sporto/kic into e2e-zombie