Merge remote-tracking branch 'lsa_YOS/master'

# Conflicts:
#	lib/yos.core-2.2.3-sources.jar
#	lib/yos.core-2.2.3.jar