compiled
Merge branch 'master' of https://github.com/engies/IMPRO

Conflicts:
	IMPRO/bin/IMPRO.apk
	IMPRO/bin/classes.dex
	IMPRO/bin/resources.ap_

merge
Change texts