production
ee
Merge branch 'master2'

Conflicts:
	src/com/nedu/android_ui_16/Android_UI_16Activity.java
Merge branch 'release/release' into production

Conflicts:
	src/com/nedu/android_ui_16/Android_UI_16Activity.java
	src/com/nedu/android_ui_16/NewQAAdapter.java
Merge branch 'hotfix/hotfix'
ed
Merge branch 'hotfix/hotfix2'
Merge branch 'hotfix/hotfix2' into production
1
2
Merge branch 'feature/duzhen/Feccxx'
1
2
Merge branch 'feature/fecc222'
1
2
Merge branch 'feature/fecc33'
Merge branch 'production' into master2
Merge branch 'master' into master2
22