Norwegian in ISFiT Online
Merge branch 'master' into isfit_online_norwegian

Conflicts:
	db/schema.rb
Merge branch 'isfit_online_norwegian'