merge for version 0.9
Merge branch 'master' of https://github.com/DaniloAM/StaminaProject

Conflicts:
	Stamina/Stamina.xcodeproj/project.pbxproj