merged conflicts
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/pt/adrz/clipx/ClipGUI.java
	src/pt/adrz/clipx/ClipSysTray.java