Merge branch 'develop'
Removed uncessary folder.
Merge branch 'master' into develop