merged geppaequo-fileupload into geppaequo-core

Change-Id: I908f31258703b727577c9f3a252c94fb8d0ec6d6