updated to have missing xcodeproj files
updated tests
something bad just happened
merge
updated with some code to be merged
Merge branch 'master' into server_release

master