处理冲突
Merge branch 'master' of https://github.com/minggo620/charmword.git

Conflicts:
	CharmWord/bin/CharmWord.apk
	CharmWord/bin/R.txt
	CharmWord/bin/classes.dex
	CharmWord/bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$id.class
	CharmWord/bin/classes/com/minggo/charmword/R$id.class
	CharmWord/bin/classes/com/minggo/charmword/R$integer.class
	CharmWord/bin/classes/com/minggo/charmword/R$layout.class
	CharmWord/bin/classes/com/minggo/charmword/R$menu.class
	CharmWord/bin/classes/com/minggo/charmword/R$string.class
	CharmWord/bin/classes/com/minggo/charmword/R$styleable.class
	CharmWord/bin/classes/com/minggo/charmword/activity/IndexActivity$MyOnPageChangeListener.class
	CharmWord/bin/classes/com/minggo/charmword/activity/IndexActivity.class
	CharmWord/bin/classes/com/minggo/charmword/activity/SampleListFragment$SampleAdapter.class
	CharmWord/bin/classes/com/minggo/charmword/activity/TestActivity.class
	CharmWord/bin/classes/com/minggo/charmword/util/MinggoDate.class
	CharmWord/bin/dexedLibs/library-5a193d0102219f9078f7d37f9b5e094a.jar
	CharmWord/bin/resources.ap_
	CharmWord/gen/com/minggo/charmword/R.java