More Java7 updates
Merge pull request #209 from dizzzz/develop

Migrate to Java7 : netbeans and webdav