validation fixes, routing
Merge branch 'linda2' into TEST

Conflicts:
	compas/app/views/layouts/application.html.erb