Switch to java7 (after rebase) #62

Merged
merged 11 commits into from Apr 4, 2013