reconfigure build path in eclipse
Merge remote-tracking branch 'origin/develop' into develop