not sure
Merge branch 'master' of https://github.com/RICJ2/CJ2

Conflicts:
	NetBeansProjects/LoginScreen/nbproject/private/private.properties