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

Conflicts:
	disponif/AndroidManifest.xml