Get FP working again.
Merge branch 'newbranch'

Conflicts:
	src/ui/console.js
	src/ui/controls.js
	src/ui/general-ui.js
	src/ui/mouse.js