Sortti tableen
Merge branch 'devel' of https://github.com/ohtu2014-halme/ilmoprojekti into devel

Conflicts:
	app/views/enrollments/index.html.erb
	app/views/layouts/application.html.erb