Sex is not the answer. Sex is the question. "Yes" is the answer.
Merge branch 'master' of https://github.com/DanielTuerk/controlcenter

Conflicts:
	web/src/main/java/net/wbz/moba/controlcenter/web/server/editor/TrackEditorServiceImpl.java
I wondered why the Frisbee was getting bigger, and then it hit me.
I wondered why the Frisbee was getting bigger, and then it hit me.
I had amnesia once - maybe twice.