Merge pull request #75 from xenu/master

added support for statcounter.com tracking code
added option for showing the mod in ban page.

also fixes issue where the Staff is not shown in ban appeals.
Merge pull request #77 from juanchan/smallfixes

optionally show mod name in templates/banned.html
?/bans: fix pagination - can now see all bans on all boards if > $config[mod][banlist_page]

Conflicts:
	inc/bans.php
Added support for BSD md5 incase md5sum isn't available.
FFmpeg support for WebMs. Fixes threads with large amounts of WebM's causing crashes for some users.
Added escapeshellarg() for WebM thumbnail generation.
Fixed blank catalog image count when zero image replies and threads with deleted files from being excluded
Merge pull request #80 from marlencrabapple/catalog-fixes

A few catalog theme fixes
Merge pull request #79 from marlencrabapple/master

FFmpeg support for WebM uploads
Fixed spoiler thumbnails not showing up in the recent theme
Fixed spoiler images in the catalog theme.
Merge pull request #81 from marlencrabapple/recent-spoiler-fix

Fixed spoiler thumbnails not showing up in the recent theme.
fix an issue with watch.js on android chrome
add user-options dialog functionality; port webm-settings to it; make a basic general settings applet; make it work on mobiles
remove a special containerchan stylesheet; it added some extra space for webms
add a very small image size for catalog
fix previous commit
Merge branch 'catalog-spoiler-fix' of https://github.com/marlencrabapple/vichan
Bug fix: users were banned from /0/ if they had a ban anywhere else

Conflicts:
	inc/bans.php