Updated with undo function

9/17/13
Merge branch 'master' of https://github.com/lazyye/CapstoneXue.Personal

Conflicts:
	Xue/src/com/MeadowEast/xue/LearnActivity.java