Shorten captions
Merge branch 'develop' of github.com:drd0rk/crawlingstats into develop
Merge branch 'master' of github.com:drd0rk/crawlingstats
Refactor userstats
Fix merge conflicts
Merge branch 'develop'