This should work
Oops.  Strings are objects
I'M AN IDE AND I LIKE TO CHANGE WHITESPACE AROUND SO THAT MERGES BREAK
AND MERGETOOLS ARE OF NO HELP.

Merge branch 'dev' of github.com:Venture-TheSphinxTeam/Sphinx into dev

Conflicts:
	app/models/Event.java