Resetting version number after merge from develop
Merging latest master branch