Upgrade project to java7