Merge pull request #83 from Venture-TheSphinxTeam/dev

Dev
Merge pull request #87 from Venture-TheSphinxTeam/chanelsbranch

Chanelsbranch
Loggggingignignginginginginging  for Votes
Small fix to edit saved queries
The missing admin file. Now admin status should be able to be toggled and set on admin page
Merge pull request #89 from ShadowSam/master

The missing admin file. Now admin status should be able to be toggled an...
Can now execute saved queries from the query subs.
Facets are now sorted alphabetically.
Standardize JIRA/INIT/Milestone etc. on dashboard and subscriptions page
Merge pull request #90 from ShadowSam/master

Standardize JIRA/INIT/Milestone etc. on dashboard and subscriptions page
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.
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