Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/pixelitor/layers/LayersMouseHandler.java
	src/main/java/pixelitor/layers/LayersPanel.java
Merge remote-tracking branch 'origin/master'