Committing updated DataTables for both trainee and trainer view modules.
Edited trainer view module also
Getting rid of some weird conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/java/org/smu/servlets/HandleCheckpointServlet.java
	src/java/org/smu/servlets/HandleModuleServlet.java
	src/java/org/smu/sis/CheckpointDataManager.java