hide my password, what a crap
Merge branch 'dev'
Merge branch 'master' of github.com:vintsie/hbtw