Tag master and merge it into develop when finishing releases and hotfixe...

...s.

Fixes git-describe inconsistencies.

This PR actually places the tags properly so that git-describe always returns exact tag on master.