Merge branch 'upload-task'

Conflicts:
	src/instrumentTest/java/com/eucsoft/foodex/test/APITest.java
	src/main/java/com/eucsoft/foodex/api/API.java