Recommitting checkpoint
Resolved conflicts
Merge branch 'master' of https://github.com/pujaraaniket2012/smusisbp

Conflicts:
	src/java/org/smu/sis/ModuleDataManager.java
	web/index.html