fix bugs all over
Merge branch 'master' of https://github.com/nkp/hackkings

Conflicts:
	models/__init__.py
	models/message.py