Roll back setting theme setting view
Set theme button state
Merge Setting view modification into iPad ver
Modify 635.txt
Add photo background for iPad ver
Add NaviBtn iPad ver
Merge branch 'ReadingView' into poetryapps_development
Merge branch 'poetryapps_development' of https://github.com/fdxyang/-PoetryLyricsApps into poetryapps_development

Conflicts:
	poetryapps.xcodeproj/project.pbxproj