added class Circle
testCircle init Main
Merge branch 'jmeprototype' of https://github.com/gormed/drunken-nemesis into jmeprototype

Conflicts:
	opus/OpusProject/src/com/opus/gui/Main.java