Add SettingActivity & change ArticleActivity
Merge branch 'master' of git@github.com:StevenKo/novel_reader.git

Conflicts:
	AndroidManifest.xml
Merge branch 'master' of git@github.com:StevenKo/novel_reader.git

Conflicts:
	src/com/ifixit/android/sectionheaders/SectionListView.java