sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	src/com/app/tomore/MainActivity.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	src/com/app/tomore/MainActivity.java