new user
auto_compute

Merge branch 'master' of github.com:structure-computation/Soja

Conflicts:
	plugins/User/views/LoginView.coffee