Merge branch 'master' into sync-service

Conflicts:
	src/instrumentTest/java/com/eucsoft/foodex/test/preferences/PreferencesTest.java