Button size corrected for mac

Button size corrected for mac
Merge branch 'Christoph'

Conflicts:
	bin/SkyLife.class