Merge branch 'hotfix/v1.0.5'
Merge branch 'master' into develop
reset version number
fix gulpfile
bumped
Merge branch 'hotfix/1.0.6' into develop

Conflicts:
	gulpfile.js