Cleaned up a lot of files
Merge remote-tracking branch 'origin/develop'