w/e
Merge branch 'master' of https://github.com/bcodendaal/SmitWinkelPhp

Conflicts:
	nbproject/private/private.xml
buttons styling