Button working
Merge origin/master

Conflicts:
	jZooper/nbproject/private/private.xml
WIP

Merge origin/master

Conflicts:
	jZooper/nbproject/private/private.xml