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