Upgraded whole project to compile with jdk 1.7