Switched to main smaccm repository
Integrate ocarina
Move to tycho 0.22 to force JavaSE-1.7