update changes for test print statements and sql test
UPDATE 02142013 FROM LAPTOP
Merge branch 'HEAD' of https://github.com/RICJ2/CJ2.git

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