update
Merge remote-tracking branch 'origin/master'

Conflicts:
	WorshipDocument/AndroidManifest.xml
	WorshipDocument/src/com/example/WorshipDocument/DetailActivity.java
	WorshipDocument/src/com/example/WorshipDocument/ViewPagerAdapter.java
update