Re #1672 Fixing the SugarCRM import issue.
Re #1672 Modifying timestamp extraction.
Merge branch 'master' into masterNeoMerge

Conflicts:
	api2-war/src/main/java/eu/europeana/api2/v2/service/SugarCRMCache.java