Merge pull request #50 from bstascavage/master

Fixed top image bug
combining pie charts to use same legend
Merge pull request #52 from bstascavage/master

Added captions to images.  STILL NEEDS WORK.
Merge pull request #53 from bstascavage/master

Removed system messages from message query counts.  Fixes #38
Merge pull request #56 from bstascavage/master

Fixed various stacktraces, including issue #55
Merge pull request #57 from bstascavage/master

Added iuser list back in
Merge pull request #58 from bstascavage/master

Added an "Update All" button
more pie chart improvement
Merge remote-tracking branch 'upstream/master'

Conflicts:
	camping/public/partials/group.html
Merge pull request #60 from wdonnell/master

pie chart stuff
Changed times to use am/pm.  Fixes #11
Merge remote-tracking branch 'upstream/master'