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
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