Completed checkpoint feature + others

Features completed in this commit:
1) CRUD Checkpoint trainer
2) preview checkpoint trainer
3) edit module details trainer UI+backend
Removed conflict in Module Data Manager
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/java/org/smu/sis/ModuleDataManager.java