filling editaccount fields
fixing editaccount
Merge branch 'master' of https://github.com/RICJ2/CJ2

Conflicts:
	NetBeansProjects/LoginScreen/src/loginscreen/StartupScreen.java
Merge branch 'master' of https://github.com/RICJ2/CJ2

Conflicts:
	NetBeansProjects/LoginScreen/src/loginscreen/StartupScreen.java