Merge branch 'dev'

Conflicts:
	extensions/ucm/class.shub_ucm.php
	extensions/ucm/class.shub_ucm_account.php
	extensions/ucm/class.shub_ucm_message.php
	extensions/ucm/class.shub_ucm_user.php
	extensions/ucm/class.ucm-api.php
	extensions/ucm/init.ucm.php
	extensions/ucm/logo.png
	extensions/ucm/shub_ucm.js
	extensions/ucm/ucm_message.php
	extensions/ucm/ucm_settings.php

Merge branch 'dev'

Conflicts:
	extensions/ucm/class.shub_ucm.php
	extensions/ucm/class.shub_ucm_account.php
	extensions/ucm/class.shub_ucm_message.php
	extensions/ucm/class.shub_ucm_user.php
	extensions/ucm/class.ucm-api.php
	extensions/ucm/init.ucm.php
	extensions/ucm/logo.png
	extensions/ucm/shub_ucm.js
	extensions/ucm/ucm_message.php
	extensions/ucm/ucm_settings.php

Merge pull request #8 from dtbaker/dev

cleanup

Merge branch 'master' of https://github.com/dtbaker/support-hub

Merge pull request #2 from dtbaker/dev

comment fix