jdk 1.6 -> jdk 1.7
Merge branch 'master' of https://github.com/dzigerlig/CDAR.git