Merge pull request #23 from KillaPL/shoutbox

Shoutbox
Merge branch 'master' into basic_view