Fixed format function to yield JSON complient result
Merge branch 'master' of github.com:seadsystem/Backend

Conflicts:
	DB/api/db.py