Merge branch 'gulp' into develop
Merge branch 'gulp' into develop
Merge branch 'master' into develop
Add push to develop so changes are always in origin
Make tag branch the one being merged into develop
Merge commit '0.0.4-7-gb00d2fd'