c
Merge branch 'master' of https://github.com/yultao/ieltspass

Conflicts:
	Android/src/tt/lab/android/ieltspass/data/WordsDao.java
	Android/src/tt/lab/android/ieltspass/fragment/PageFragmentVocabulary.java