Added mayor and post_time
:x

Conflicts:
	database.db