Merge branch 'master' into develop
Removed old files from bad merge.