Merge origin/master

Conflicts:
	nbproject/project.properties
	src/com/ag/clinic/doctor/TestingFrame.java