commit to pull
Merge branch 'master' of https://github.com/kinglbf/FroshAndroidApp

Conflicts:
	AndroidManifest.xml
Merge branch 'master' of https://github.com/kinglbf/FroshAndroidApp.git

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