init eclipse
Merge remote-tracking branch 'origin/zman'