Merge tag '1.5.1' into develop

Released v1.5.1.

Changelog available on the website.
Fix: make sure git hf update always returns to the right branch after an update
need to commit to create hotfix
need to commit to create hotfix
Merge tag 'tag_1.3.3.4.1' into develop

Finally. This should be the first auto hotfix...if all goes well
need to commit to create hotfix
Merge branch 'master' into develop
Merge branch 'master' into develop
fixed conflict after git dev merge
added update version feature
Merge pull request #1 from soldotno/feature/auto_versioncontrol

Feature/auto versioncontrol