Merge remote-tracking branch 'origin/view'

Conflicts:
.classpath
.settings/org.eclipse.core.resources.prefs
bin/LearnEng.apk
bin/classes.dex
bin/classes/khy/learneng/DBHelper.class
bin/classes/khy/learneng/MainActivity$1.class
bin/classes/khy/learneng/MainActivity$DrawerItemClickListener.class
bin/classes/khy/learneng/model/Category.class
bin/classes/khy/learneng/model/Phrase.class
bin/classes/khy/learneng/model/Sentence.class
bin/classes/khy/learneng/view/MainActivity.class
bin/dexedLibs/android-support-v4-2a30595e14f0991fadd23a9c914e8bb5.jar

bin/dexedLibs/android-support-v7-appcompat-242f9ff9251e9bbeebb54b19605c9
fca.jar

bin/dexedLibs/android-support-v7-appcompat-ccd472eabb495a63c80439a146f85
fbe.jar
bin/jarlist.cache
bin/resources.ap_
src/khy/learneng/DBHelper.java
src/khy/learneng/MainActivity.java
src/khy/learneng/model/Category.java
src/khy/learneng/model/Phrase.java
src/khy/learneng/model/Sentence.java