Uploadi vörx
Juttuja
Muikee validointi kuvan dimensioihin...
Käännöksiä
Merge branch 'devel' of https://github.com/ohtu2014-halme/ilmoprojekti into devel

Conflicts:
	app/controllers/projects_controller.rb
	app/views/enrollments/new.html.erb
	db/schema.rb
Merge pull request #102 from nsikkila/master

testejä
Jees
Merge branch 'devel' of https://github.com/ohtu2014-halme/ilmoprojekti into devel
Merge pull request #103 from nsikkila/master

työväri ei yliaja acceptedia ja forcedia
Lokalisaatiota
Merge branch 'devel' of https://github.com/ohtu2014-halme/ilmoprojekti into devel
korjattu seed
bundle_page testejä
Merge remote-tracking branch 'upstream/devel'