bug fixing for send
Merge branch 'master' of https://github.com/FXuZ/colock-server

Conflicts:
	db.sqlite3
	message/views.py