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
mailin muutosta
Merge branch 'devel' of github.com:ohtu2014-halme/ilmoprojekti into devel
mail kuntoon
pikku lisäys sähköpostiviestiin
email lisätty bundlen aika
Merge remote-tracking branch 'upstream/devel'