ui
Merge branch 'dev' of https://github.com/Java3-2/Card-English into dev

Conflicts:
	CardEnglish/src/com/Mars/data/Adapter/CardSelectCursorAdapter.java
	CardEnglish/src/com/Mars/ui/Activity/CardSelectActivity.java
	CardEnglish/src/com/Mars/ui/Activity/RivalListActivity.java