Merge pull request #83 from Venture-TheSphinxTeam/dev

Dev
Added watch.post_target to conf and fixed the vote.post url
Merge pull request #90 from ShadowSam/master

Standardize JIRA/INIT/Milestone etc. on dashboard and subscriptions page
Et qu'il faut pour tresser ma couronne mystiquei Imposer tous les temps et tous les univers.
Merge pull request #91 from Venture-TheSphinxTeam/chanelsbranch

Chanelsbranch
Merge pull request #88 from Venture-TheSphinxTeam/dev

Dev
Merge pull request #92 from Venture-TheSphinxTeam/master

Je ne me sentis plus guidé par les haleurs
Adding icon CSS for making them smaller.
Fix bug with modals on entity pages.
Minimal null checking when submiting/editing a comment
Merge remote-tracking branch 'upstream/dev' into chanelsbranch
User icons are (not really) done because it's difficult to display the icon of a user that doesn't exist. The changes to the events will allow us to pull the user associated (or for the time events, just pulls a default user). Messing with the User Settings page. Null checking for img, assumed safety due to browser. Also, I dislike forms...probably because I'm starting to float....this commit message is probably the longest I've ever written. May there be many more.
Timestamps in its simplest form cuz it's 3 am and I can't skip security no matter how fluffy the bed is. Timestamps on comments, btw. I didn't revamp everything. So....pull me :D
Merge pull request #93 from Venture-TheSphinxTeam/chanelsbranch

Chanelsbranch
User icons on dashboard look up a user based on the event. Each event type just returns default-user
Logging changes to suppress all console output
Merge branch 'dev' of https://github.com/Venture-TheSphinxTeam/Sphinx into dev
Merge pull request #94 from Venture-TheSphinxTeam/dev

Dev
Just event icons on dashboard. Adding user icons would hit performance and we don't want to add to a problem we already have
Merge remote-tracking branch 'upstream/dev' into chanelsbranch