undo/settings
Merge branch 'master' of https://github.com/rasel160/Chi

Conflicts:
	gen/com/MeadowEast/xue/R.java
	src/com/MeadowEast/xue/MainActivity.java