adding java7
switching to pull/push the current branch