Merge pull request #23 from scasBot/beta

Beta
Fixed bug in merge
Merge branch 'master' of https://github.com/scasBot/i4
stats.php changed
Merge branch 'beta' of git@github.com:scasBot/i4 into beta
Fixed contact date ordering
Changed permissions
Merge branch 'beta' of https://github.com/scasBot/i4
Chart.js added
Fixed cases by priority
Merge pull request #30 from willyxiao/master

Some quick fixes
Chart created, doesn't look pretty.
Rolling back inbox
Add .swp to ignore
Stats by i4 round 1
DOCUMENTATION updated
Merge pull request #31 from willyxiao/master

Profile Statistics for the i4!
Updated permissions.sh
Merge branch 'beta' of github.com:scasBot/i4 into beta