test
Merge remote-tracking branch 'origin/master'

Conflicts:
	static/js/views/register-view.js