Merge branch 'master' into pep8editing

Conflicts:
	cyder/core/cyuser/views.py

Conflict in views, removed my pep8 edit and kept murrown's