Final Changes
Merge branch 'master' of https://github.com/pyadla/StudyGroup

Conflicts:
	WebContent/Layout.jsp