Mac Stuff
Merge branch 'master' of https://github.com/rivie/JavaMatch

Conflicts:
	nbproject/private/private.properties