Fixed message fields

Conflicts:
	server/app/models.py
Fixed stupid bug.
Fixed typo in get_messages