Signed-off-by: Exikle <dixondcunha@gmail.com>
Merge branch 'master' of https://github.com/Exikle/AthletesFoot.git

Conflicts:
	project.properties


Signed-off-by: Exikle <dixondcunha@gmail.com>