geppaequo-filepuload merged to geppaequo-core

plus some UI niceties

Change-Id: I1030c318b27c63f1d4934bb3f48f275dd195378c