Set Java execution environment to 1.7.
updated version number to 2.3.1
Merge branch 'origin/master'