Added eclipse build
Merge branch 'dev'