Merge branch 'master' of github.com:smirfolio/mica into features/Export-studies-mica-server

Conflicts:
	src/main/drupal/modules/mica/extensions/mica_datasets/mica_connector/mica_connector.query_api.inc
	src/main/drupal/modules/mica/extensions/mica_datasets/mica_datasets.module