Fixed assay with protocols creation for microarray tech
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	pom.xml
Merge remote-tracking branch 'origin/develop' into develop