Split main into pages and resources. Names make now a little more sense
Solved a bug in a chat query
Merge branch 'REST'

Conflicts:
	models.py