Cubes that are awesome
Merge remote-tracking branch 'origin/philipp'

Conflicts:
	Tryangle/src/com/januskopf/tryangle/canvas/Canvas.java
	Tryangle/src/com/januskopf/tryangle/canvas/TriangleArray.java
deleted MouseListener