finished my part
Merge branch 'master' of https://github.com/molisani/sfs_mobile

Conflicts:
	sfs_mobile/AndroidManifest.xml
	sfs_mobile/res/values/strings.xml