* testing
Merge branch '7.22pantareiY' of https://github.com/pantarei/pantarei-drupal into 7.22pantareiY

Conflicts:
	sites/all/modules/contrib/search_api_db
* 4 upadted