国开行修改
Merge branch 'master' of github.com:hyrtyp/guokaihang

Conflicts:
	actionbarsherlock/bin/actionbarsherlock.jar
	ceistyle/bin/ceistyle.jar