more frontttttttttttttttttt
Merge branch 'master' of https://github.com/ronaldsmartin/APO-DZ-Android

Conflicts:
	APO-DZ/res/values/strings.xml