fixed DAO merge issues
fixed dao.read call. read was expecting an Integer
added NULL as an arg to getAllUsers(). this will have to get tested.
in method updateMaterial, the dao.read() was expecting an int value
dao.read() call were expecting an Integer
Shane merge
Merge remote-tracking branch 'Main/master'

Conflicts:
	src/com/myboard/business/Material.java
	src/com/myboard/dao/CourseMaterialDao.java