Merge remote-tracking branch 'origin/master'

Conflicts:
	socks/__init__.pyc
	socks/settings.pyc
	socks/wsgi.pyc
	users/__init__.pyc
	users/models.pyc

made change to initial subscription status in billing info