merged changes
Merge branch 'master' of https://github.com/adrianojlt/clipx.git

Conflicts:
	src/pt/adrz/clipx/GuiState.java