Merge remote-tracking branch 'origin/master'

Conflicts:
	project.properties
	res/layout/fragment_home_user.xml
	res/layout/fragment_medal_medaglie.xml
	src/com/example/beyondto/LoginFragment.java
Merge branch 'master' of https://github.com/PaNdA88/BeyondTO.git
Merge branch 'master' of https://github.com/PaNdA88/BeyondTO