0523
Merge branch 'master' of http://github.com/vote-system/PHP

Conflicts:
	pinyin.php
	update_head_imag.php
	update_user_info.php
	vote_fns.php
Merge branch 'master' of http://github.com/vote-system/PHP

Conflicts:
	badge_fns.php
	friend_fns.php
	time.php
	update_user_info.php
	vote_fns.php
Merge branch 'master' of http://github.com/vote-system/PHP

Conflicts:
	friend_fns.php
	login.php
	logout.php
	push_message_to_ios.php
Merge branch 'master' of http://github.com/vote-system/PHP

Conflicts:
	time.php
Merge branch 'master' of http://github.com/vote-system/PHP

Conflicts:
	time.php
	vote_fns.php
0706