Modify pom.xml to work with Java 7
Merge branch 'master' of github.com:tonyguolei/DAC_ENSIMAG