Merge branch 'master' of https://github.com/esteinberg/plantuml4idea into allPages2

Conflicts:
	src/org/plantuml/idea/action/CopyDiagramToClipboardAction.java
	src/org/plantuml/idea/plantuml/PlantUml.java
	src/org/plantuml/idea/toolwindow/PlantUmlToolWindow.java