repository changes
Merge branch 'master' of https://github.com/LampTFG/Project1

Conflicts:
	bin/classes.dex
	bin/resources.ap_
bug fixing