Changes to keep Xcode project up to date with VS2013 project + recent changes
Cleanup files