0.7.0.0 代码重构6
Merge remote-tracking branch 'origin/master'

Conflicts:
	coo-m-vote/src/com/coo/m/vote/VoteManager.java
	coo-m-vote/src/com/coo/m/vote/activity/ProfileActivity.java