java version 1.6
Merge branch 'master' of https://github.com/ARiDa/moap.git