upgrade to java 7; also to latest version of ZK and scalatest
Merge branch 'java-7' into develop