Merge pull request #63 from richardjm/devel

Missing semi-colon causing problems
Use contrast function for calculating text color in navbar
Fixed state information for gcode file upload. Now offers some status text that gives feedback whether file is still uploading to the server or being saved to disk on the server.
Fixed buggy column styles for gcode and timelapse file tables
Fixed configuration of snapshot url
Switched column sizes for gcode and timelapse file tables to pixel values.
Added (optional!) watermark addition to generated timelapse movies.
Fixed settings for ffmpeg path
Fixed using wrong item collection for timelapse files, lead to always displaying all files, not just the ones of the current page.