Update working copy
Merge branch 'develop' of https://github.com/TraderZed/turbo-hipster into develop