UI attempts...
Merge branch 'rogue'

Conflicts:
	core/base.pl