Git Commit for Added Comment
Merge branch 'master' of https://github.com/sureshjayana/DMPOC

Conflicts:
	logs/app.log
	src/main/java/com/diamondmind/dashboard/controller/SchoolController.java
	src/main/java/com/diamondmind/dashboard/criteria/SearchCriteria.java
	src/main/java/com/diamondmind/dashboard/services/CustomUserDetailsService.java
	src/main/java/com/diamondmind/dashboard/services/LogOutServiceImpl.java
	src/test/java/com/diamondmind/dashboard/services/impl/ImplSchoolServicesTest.java