Features from production
Merge branch 'master' of https://github.com/ratkaisutiimi/pajav2.git

Conflicts:
	sites/default/modules/apaja_features/courses_views/courses_views.context.inc