my updates

Conflicts:
	fitg/ai/ai.py
	fitg/backend/orm.py