Merge branch 'hotfix'
changed version number on main file
Merge branch 'master' into develop