Update properties. no changes to core java files
Merge branch 'HEAD' of https://github.com/RICJ2/CJ2.git

Conflicts:
	NetBeansProjects/LoginScreen/build/classes/loginscreen/Mediator.class
	NetBeansProjects/LoginScreen/nbproject/private/private.properties
	NetBeansProjects/LoginScreen/nbproject/project.properties