Some small fixes, mostly cosmetic.
Merge branch 'master' of github.com:kioopi/billy

Conflicts:
	webroot/js/script.js