nothing
Merge branch 'master' of https://github.com/prequiem/cbims

Conflicts:
	cbims/cbims/settings.pyc