Fix sync
Merge pull request #54 from guywithnose/master

Fix sync
Make the math more resilient.
Merge pull request #55 from nubs/master

Make the math more resilient.
UI Updates
Cache watermark
Merge pull request #56 from toldavidorick/master

UI Updates
Merge pull request #57 from guywithnose/master

Cache watermark
UI Updates
Merge pull request #58 from toldavidorick/master

UI Updates
Merge pull request #4 from nubs/master

Sync branches.
Updates for CTOL Video site