misc
Merge branch 'ui_etc'

Conflicts:
	log/development.log
fix?