** Updated bunch of features
Merge branch 'master' of https://github.com/ratkaisutiimi/pajav2.git

Conflicts:
	sites/default/modules/apaja_features/user_profile_page/user_profile_page.views_default.inc