fixing api
Merge branch 'vador' of github.com:Nozdi/shmir into vador

Conflicts:
	api/database/handlers.py