Merge branch 'master' into develop
Removed some incomplete features
Merge branch 'develop'