no change
Merge branch 'master' of github.com:hyrtyp/guokaihang

Conflicts:
	Cei/bin/cei.apk
	Cei/bin/classes.dex
	Cei/bin/classes/com/hyrt/cei/R$styleable.class
	Cei/bin/resources.ap_
	actionbarsherlock/bin/actionbarsherlock.jar
	ceistyle/bin/ceistyle.jar