Merge pull request #532 from SteveGilvarry/feature-h264-videostorage

Merge master to feature-h264-videostorage and restore web GUI
Merge pull request #554 from SteveGilvarry/feature-h264-videostorage

Keeping branch current, and fixing libvlc compile issues
Merge pull request #613 from SteveGilvarry/feature-h264-videostorage

feature-h264-videostorage mp4 container