Merge origin/master

Conflicts:
	jsica/src/main/resources/MyBundle.properties
Merge origin/master