activity tratment
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/R.txt
	bin/classes.dex
	bin/classes/.gitignore
	bin/classes/control/MainActivity.class
	bin/classes/control/MenuActivity.class
	bin/classes/control/TreatmentActivity.class
	bin/classes/model/datasource/DatabaseList.class
	bin/dexedLibs/appcompat_v7-de8a309204fc37bbd60edc6bebbbb5c7.jar
	bin/java5775_5366_9373.apk
	bin/resources.ap_
	res/layout/activity_treatment.xml