Merge
merge conflict
Merge
modifty uploader
Merge branch 'server'
Now ready to test
project recovery
Merge branch 'master' of https://github.com/bcip/SchrodingersPhone
Modify ServerInfo
update server
Merge branch 'master' of https://github.com/bcip/SchrodingersPhone
Test
recovery
Test
solved
prepare to rm
rmed
repair
rm .claapath .project
Merge branch 'master' of https://github.com/bcip/SchrodingersPhone