switched to eclipse kepler support
fixed merge conflicts