Improve appearance of text-shadow when dark navbar colors are used; adjust color of carets in navbar menus according to the navbar color
Define brand image in CSS instead of an <img> tag to allow it to be styled; add high resolution tentacle brand image for retina/high-res displays; create non-clashing light version of tentacle brand image to be used when darker custom colors are chosen in settings
Add black color setting
Hotfix for recent Flask/Werkzeug versions breaking Flask-Login module
(cherry picked from commit 84caaeb)
Use span instead of button for upload buttons, otherwise FF and IE hiccup...
(cherry picked from commit ee3bc84)
Added jquery.min.js locally to avoid depending on
internet connection on clients which may be
locally and offline
Merge pull request #151 from algspd/master

Added jquery.min.js locally to avoid depending on internet connection on clients which may be locally and offline
Merge pull request #145 from daprice/master

Improve nav bar appearance when custom colors are used
Add extrusion volume calculation for Slic3r gcode files
Fix for #153 backported from events branch
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into devel

Conflicts:
	octoprint/static/css/octoprint.less
Added filament diameter retrieval from gcode generated by Cura, fixed Slic3r version
Merge branch 'CapnBry-extrudevol' into devel
Updated module versions
Merge branch 'devel' into events