fix multitouch met dirty fix
Merge remote-tracking branch 'origin/davidbranch' into davidbranch

Conflicts:
	app/src/main/java/zwaggerboyz/instaswaggify/CanvasDraggableItem.java
	app/src/main/java/zwaggerboyz/instaswaggify/CanvasView.java
betere matrix, maar ook met dirty hack