yet another attempt at getting a decent configuration for spring
Merge branch 'master' of https://github.com/TWU37NA/ConferenceScheduler

Conflicts:
	.gitignore