0702
0707
0716
0716
test html
Merge branch 'master' of http://github.com/vote-system/PHP

Conflicts:
	form/login.html
	get_vote_detail.php
	push_message_to_ios.php
	time.php