Merge branch 'master' into network-api-client
Fix confilct in MainActivity
Add API.uploadFood mockup and Refactore APITest
Merge branch 'network-api-client' into upload-task

Conflicts:
	src/main/java/com/eucsoft/foodex/MainActivity.java