commit some changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/classes/com/iel/hos/actions/DoctorsAction.class
	build/classes/com/iel/hos/dao/DoctorsDao.class
	build/classes/com/iel/hos/services/DoctorsService.class
	src/com/iel/hos/actions/DoctorsAction.java
	src/com/iel/hos/dao/DoctorsDao.java
	src/com/iel/hos/services/DoctorsService.java