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

Conflicts:
	sites/default/modules/ajax_og_subscribe/ajax_og_subscribe.module