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

Conflicts:
	NetBeansProjects/LoginScreen/build/classes/loginscreen/LoginScreenForm.class
	NetBeansProjects/LoginScreen/build/classes/loginscreen/StartupScreen.class