Merge branch 'masterDevelopment' into development

Fix xcodeproj file to include new files