Changed order of tables
Merge remote-tracking branch 'origin/master'

Conflicts:
	sql/schema.mysql
Fixing the merge...