Upgrade java to 1.7
Merge branch 'develop' of github.com:rinfo/rdl into develop