Updated with merged codes
Merge branch 'master' of https://github.com/lazyye/CapstoneXue.Personal

Conflicts:
	Xue/.classpath
	Xue/gen/com/MeadowEast/xue/R.java
	Xue/res/layout/activity_learn.xml
	Xue/res/layout/activity_main.xml
	Xue/res/layout/activity_update.xml
	Xue/res/layout/alert_card.xml
	Xue/src/com/MeadowEast/xue/LearnActivity.java