cmmite chagne
commit data/Database.java
cc
Merge branch 'master' of https://github.com/yultao/ieltspass

Conflicts:
	Android/AndroidManifest.xml
	Android/assets/sqls/getWordList.sql
	Android/res/layout/activity_vocabulary.xml
	Android/res/layout/center_fragment_vocabulary_vlist.xml
	Android/res/values/strings.xml
	Android/res/values/strings_activity_settings.xml
	Android/src/tt/lab/android/ieltspass/Constants.java
	Android/src/tt/lab/android/ieltspass/Logger.java
	Android/src/tt/lab/android/ieltspass/Utilities.java
	Android/src/tt/lab/android/ieltspass/activity/DailyActivity.java
	Android/src/tt/lab/android/ieltspass/activity/ListeningActivity.java
	Android/src/tt/lab/android/ieltspass/activity/SettingsActivity.java
	Android/src/tt/lab/android/ieltspass/activity/SpeakingActivity.java
	Android/src/tt/lab/android/ieltspass/activity/VocabularyActivity.java
	Android/src/tt/lab/android/ieltspass/data/Database.java
	Android/src/tt/lab/android/ieltspass/data/WordsDao.java
	Android/src/tt/lab/android/ieltspass/fragment/ReadingFragmentAnswers.java
	Android/src/tt/lab/android/ieltspass/fragment/SpeakingFragmentRecordings.java
Merge branch 'master' of https://github.com/yultao/ieltspass

Conflicts:
	Android/AndroidManifest.xml
	Android/assets/sqls/getWordList.sql
	Android/res/layout/activity_vocabulary.xml
	Android/res/layout/center_fragment_vocabulary_vlist.xml
	Android/res/values/strings.xml
	Android/res/values/strings_activity_settings.xml
	Android/src/tt/lab/android/ieltspass/Constants.java
	Android/src/tt/lab/android/ieltspass/Logger.java
	Android/src/tt/lab/android/ieltspass/Utilities.java
	Android/src/tt/lab/android/ieltspass/activity/DailyActivity.java
	Android/src/tt/lab/android/ieltspass/activity/ListeningActivity.java
	Android/src/tt/lab/android/ieltspass/activity/SettingsActivity.java
	Android/src/tt/lab/android/ieltspass/activity/SpeakingActivity.java
	Android/src/tt/lab/android/ieltspass/activity/VocabularyActivity.java
	Android/src/tt/lab/android/ieltspass/data/Database.java
	Android/src/tt/lab/android/ieltspass/data/WordsDao.java
	Android/src/tt/lab/android/ieltspass/fragment/ReadingFragmentAnswers.java
	Android/src/tt/lab/android/ieltspass/fragment/SpeakingFragmentRecordings.java
Merge branch 'master' of https://github.com/yultao/ieltspass

Conflicts:
	Android/AndroidManifest.xml
	Android/assets/sqls/getWordList.sql
	Android/res/layout/activity_vocabulary.xml
	Android/res/layout/center_fragment_vocabulary_vlist.xml
	Android/res/values/strings.xml
	Android/res/values/strings_activity_settings.xml
	Android/src/tt/lab/android/ieltspass/Constants.java
	Android/src/tt/lab/android/ieltspass/Logger.java
	Android/src/tt/lab/android/ieltspass/Utilities.java
	Android/src/tt/lab/android/ieltspass/activity/DailyActivity.java
	Android/src/tt/lab/android/ieltspass/activity/ListeningActivity.java
	Android/src/tt/lab/android/ieltspass/activity/SettingsActivity.java
	Android/src/tt/lab/android/ieltspass/activity/SpeakingActivity.java
	Android/src/tt/lab/android/ieltspass/activity/VocabularyActivity.java
	Android/src/tt/lab/android/ieltspass/data/Database.java
	Android/src/tt/lab/android/ieltspass/data/WordsDao.java
	Android/src/tt/lab/android/ieltspass/fragment/ReadingFragmentAnswers.java
	Android/src/tt/lab/android/ieltspass/fragment/SpeakingFragmentRecordings.java
Merge branch 'master' of https://github.com/yultao/ieltspass

Conflicts:
	Android/.classpath
	Android/res/layout/activity_vocabulary.xml
	Android/src/tt/lab/android/ieltspass/EmailSender.java
	Android/src/tt/lab/android/ieltspass/activity/FeedbackActivity.java
	Android/src/tt/lab/android/ieltspass/activity/VocabularyActivity.java
delete mail.jar
c
cc
cc
Merge branch 'master' of https://github.com/yultao/ieltspass

Conflicts:
	Android/.classpath
	Android/javax.mail.jar
	Android/res/layout/activity_about.xml
	Android/res/layout/activity_download.xml
	Android/res/layout/activity_download_vlist.xml
	Android/res/layout/activity_feedback.xml
	Android/src/tt/lab/android/ieltspass/Constants.java
	Android/src/tt/lab/android/ieltspass/HttpUtilities.java
	Android/src/tt/lab/android/ieltspass/Logger.java
	Android/src/tt/lab/android/ieltspass/MailSender.java
	Android/src/tt/lab/android/ieltspass/Utilities.java
	Android/src/tt/lab/android/ieltspass/activity/DownloadActivity.java
	Android/src/tt/lab/android/ieltspass/activity/FeedbackActivity.java
	Android/src/tt/lab/android/ieltspass/activity/ListeningActivity.java
	Android/src/tt/lab/android/ieltspass/activity/SettingsActivity.java
	Android/src/tt/lab/android/ieltspass/activity/SpeakingActivity.java
	Android/src/tt/lab/android/ieltspass/activity/VocabularyActivity.java
	Android/src/tt/lab/android/ieltspass/data/Settings.java
	Android/src/tt/lab/android/ieltspass/fragment/SpeakingFragmentRecordings.java
	Android/src/tt/lab/android/ieltspass/model/Familiarity.java
new dab
cc