Merge remote-tracking branch 'origin/master'

Conflicts:
	res/values/strings.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/ToMoreTest.apk
	bin/classes.dex
	bin/resources.ap_
	gen/com/app/tomore/R.java
	res/values/strings.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/ToMoreTest.apk
	bin/classes.dex
	bin/resources.ap_
	gen/com/app/tomore/R.java
	res/values/strings.xml