Updating Version Numbers
Merge branch 'feature/CleanUp' into develop