WIP
Merge branch 'develop'

Conflicts:
	lib/ui.js
	result.js
	src/result.coffee
	src/ui.coffee