ui improvements
Merge branch 'master' of github.com:d120/padman

Conflicts:
	private/template.inc.php
move javascript to external js file