Merge pull request #58 from Venture-TheSphinxTeam/dev

Dev
This should work
Oops.  Strings are objects
EntitySubscription.java
Merge pull request #59 from ShadowSam/master

Subscription page : entity deletion => complete
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
Faceted search queries are working. Cool beans yo.
Merge pull request #60 from Venture-TheSphinxTeam/dev

Dev
Update README.md
Going to new subscription branch for Yingling