Began work on preventing dupes
Merge branch 'dev' of github.com:Venture-TheSphinxTeam/Sphinx into dev
Merge pull request #79 from Venture-TheSphinxTeam/chanelsbranch

Chanelsbranch
Fixing search page cards and adding icons to denote init, mile, and
risk.
Added event images.
Fix order of events displaying.
Editing the entity pages. Initiative is basically done. Dunno if it
looks good.
A stove is a stove no matter where you go
Merge branch 'dev' of github.com:Venture-TheSphinxTeam/Sphinx into dev

Conflicts:
	app/controllers/Application.java
Added subscribe/vote/watch buttons to search page results
Changing milestone page.
Changing risk pages.
Adding arrows to sort buttons.
Merge remote-tracking branch 'upstream/dev'
Merge pull request #80 from ShadowSam/master

Added subscribe/vote/watch buttons to search page results
Merge remote-tracking branch 'upstream/dev'
Cleaned up all references to username that are no longer needed due to the login security.
Merge pull request #81 from ShadowSam/master

Cleaned up all references to username that are no longer needed due to t...
Merge remote-tracking branch 'upstream/dev'
Fixing issue with username.