Fixed jdk 7 compilation issue
Merge branch 'master' of github.com:openforis/collect