a
Merge branch 'master' of https://github.com/uid/census

Conflicts:
	issue_task.php
Merge branch 'master' of https://github.com/uid/census

Conflicts:
	getDB.php