Converted line delimiter
Merge branch 'develop' into fix/STOR-678

Conflicts:
	src/main/java/it/grid/storm/catalogs/SurlMultyOperationRequestData.java