tutorial 8
tutorial 8
tutorial 8
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	EmPubLite/build/res/all/debug/values/values.xml
	EmPubLite/src/main/AndroidManifest.xml