Merge branch 'master' of https://github.com/dasmoth/dalliance

Conflicts:
	js/browser-ui.js
	js/cbrowser.js
merge 2