update
Merge branch 'master' of https://github.com/poorevil/CometAjax

Conflicts:
	CometAjax/settings.pyc
	CometAjax/urls.pyc