order field into field definition model
Merge remote-tracking branch 'origin/master'

Conflicts:
	theme/static/css/style.css