commit
Merge branch 'master' of git@github.com:zot/Leisure.git

Conflicts:
	lib/browser.js
	lib/browser.js.tmp
	www/bootLeisure.js