only updload if backup or recommendations are enabled
fixed issue with orphaned annotation removal (see #142)
Merge remote-tracking branch 'origin/ribbons' into ribbons
ensured java6 compatibility