Added XCode workspace
Merge branch 'added-workspace' into dev