artifact + button
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/allboxx/client/ui/ClientFrame.java