Merge branch 'jmeprototype' of https://github.com/gormed/drunken-nemesis into jmeprototype

Conflicts:
	opus/OpusProject/src/com/opus/gui/OpusApplication.java
	opus/OpusProject/src/com/opus/logic/UserManager.java
visualized Calendar
add classes compare properti
calendar frame kp
Merge branch 'jmeprototype' of https://github.com/gormed/drunken-nemesis into jmeprototype

Conflicts:
	opus/OpusProject/src/com/opus/gui/frames/StartUserFrame.java
asdfertz
ignore pngs
…
...
Merge branch 'master' of https://github.com/gormed/drunken-nemesis

Conflicts:
	.gitignore
	opus/OpusProject/nbproject/build-impl.xml
	opus/OpusProject/nbproject/project.properties
	opus/OpusProject/nbproject/project.xml
……
Merge branch 'jmeprototype'

Conflicts:
	.gitignore
	opus/OpusProject/nbproject/project.properties
	opus/OpusProject/nbproject/project.xml
	opus/OpusProject/src/com/opus/gui/frames/NewsFrameMenu.java
	opus/OpusProject/src/com/opus/gui/frames/StartUserFrame.java