removed debuging from update-hook

Conflicts:
	tools/update-hook.php
don't allow tags with blank basenames
Merge branch 'ui3' into ui3-stable

Conflicts:
	classes/JohnVanOrange/jvo/Tag.php
	tools/update-hook.php
Merge branch 'ui3' into ui3-stable
Merge branch 'ui3' into ui3-stable
Merge branch 'ui3' into ui3-stable
Merge branch 'master' into stable

Conflicts:
	classes/JohnVanOrange/jvo/Tag.php
tweak menu colors for skin theme
Merge branch 'ui3' into ui3-stable
removed old pretty theme
theme coloring tweaks
Merge branch 'ui3-stable' into stable

Conflicts:
	classes/JohnVanOrange/jvo/Tag.php
	tools/update-hook.php
sql to update db with new public/private resource scope
fix js error
updates to store resources with proper public or private trait
toolbar buttons have push down effect
updated master sql file for resource table changes
Merge branch 'resources'