Renamed project files.
Merge branch 'develop'
Re-added project files.