staged
Merge branch 'master' of https://github.com/activecs/education

Conflicts:
	SpringMVC/.settings/org.eclipse.core.resources.prefs