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

Conflicts:
	db/schema.rb
Verifiointikamaa projectbundlelle