Merge branch 'master' into sync-service

Conflicts:
	src/instrumentTest/java/com/eucsoft/foodex/test/preferences/PreferencesTest.java
	src/main/java/com/eucsoft/foodex/adapter/FoodPairsAdapter.java
	src/main/java/com/eucsoft/foodex/api/API.java
	src/main/java/com/eucsoft/foodex/preferences/Preferences.java
	src/main/java/com/eucsoft/foodex/task/BonAppetitTask.java