Paskaa!
Merge branch 'master' of https://github.com/ratkaisutiimi/pajav2.git
Merge branch 'master' of https://github.com/ratkaisutiimi/pajav2.git
Merge branch 'master' of https://github.com/ratkaisutiimi/pajav2.git
PHP notice management.
Merge branch 'master' of https://github.com/ratkaisutiimi/pajav2.git

Conflicts:
	sites/default/modules/apaja_features/content_types/content_types.info