* adjust code struct
Merge remote-tracking branch 'origin/master'
* move persistenceTest code to xctest group
Merge remote-tracking branch 'origin/master'
*correct project settings