Merge dev into master to change branch usage

From now on master will represent the development for the next release.