ClientTestActivity
...
Merge branch 'master' of https://github.com/OT-SIMS-2013/android.git

Conflicts:
	disponif/src/com/sims2013/disponif/client/ClientTestActivity.java