Fix naming issue
bump version
Merge branch 'hotfix/quick-fix'

* hotfix/quick-fix:
  bump version
  Fix naming issue

Conflicts:
	gulpfile.js
Version bump
fixing shit