Merge branch 'master' of https://github.com/kwnccc/gulp-automation

Conflicts:
	gulpfile.js