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

Conflicts:
	app/views/projectbundles/index.html.erb
Talteen
Merge branch 'devel' of https://github.com/ohtu2014-halme/ilmoprojekti into devel