:
Merge branch 'master' of git://github.com/rcastley/SCC

Conflicts:
	data/db/kcpanel.db