code merge
code changes
Merge branch 'master' of https://github.com/sureshjayana/DMPOC

Conflicts:
	src/main/java/com/diamondmind/dashboard/services/LogOutServiceImpl.java
	src/test/java/com/diamondmind/dashboard/services/impl/ImplSchoolServicesTest.java