Merging
Merge remote-tracking branch 'origin/master'

Conflicts:
	sciStoreClient/log4j.properties