r
Merge branch 'master' of https://github.com/tongning/elections

Conflicts:
	elections/public/db.inc.php