Merge branch 'CM/theme' into constantMurphy

Conflicts:
	Plugin.class.php
	common.php
	install.php