.
Merge branch 'master' of https://github.com/journeystone/rockit

Conflicts:
	rockhq/rockhq/settings.pyc