- classpath changed due to eclipse upgrade
Merge remote-tracking branch 'origin/master'