Merge branch 'hotfix/1.0.6'
fixing versioning
tidied gulp file
build completed
Updated icon
updated api
Merge branch 'hotfix/1.0.7' into develop

Conflicts:
	gulpfile.js