Properly calculate time deltas (forgot the days)
(cherry picked from commit 84012d1)
Use G28 for homing (G1 was a copy-paste-error)

Fixes #314
(cherry picked from commit 5b8126a)
Disable webcam stream when control tab is not in focus.

Fixes #316
(cherry picked from commit 1b4a7c7)
More intelligent handling of disabling and re-enabling the webcam stream.

See #314
(cherry picked from commit 1dd0aba)
A couple of manual merges...
Merge branch 'master' into toMerge

Conflicts:
	octoprint/server.py
	setup.py
	src/octoprint/printer.py
	src/octoprint/static/js/app/main.js
	src/octoprint/util/__init__.py
Changed version...
Also recognize --iknowwhatimdoing when running as daemon

Fixes #337
Also recognize --iknowwhatimdoing when running as daemon

Fixes #337
(cherry picked from commit 417487e)
Bugfix: Do not run gcode analyzer when a print is ongoing

Evaluate active flag on gcode analyzer AFTER fetching an item from the work queue, otherwise it will always start working once it finds something if the active flag was true once but then switched to false while the queue was still empty.  Thanks to @Salandora for spotting this.

Fixes #357

(manually cherry-picked from 592f3dc)
Bed Dimensions in Printer Settings
remove unused Variables
Merge branch 'devel' into Salandora-settings
Settings for bed dimension (PR) and extruder offsets

Changed the bed dimension PR slightly to use a computed property instead of two separate values and only a computed reader, added options for extruder offsets.
Extracted all used regexes in the comm layer and precompiled them

Possible improvement of #390
Extracted all used regexes in the comm layer and precompiled them

Possible improvement of #390

(cherry picked from commit 89cae22b9130865a75d1e8eee15c7924b1a89402)

Conflicts:
	src/octoprint/util/comm.py
Renamed compiled regexes to match the new naming scheme
Fixed temperature graph again after changes from last night
Hopefully fixed a race condition that could occur when pressing "Print" (file not opened yet, but comm layer tries to fetch next command)
Hopefully fixed a race condition that could occur when pressing "Print" (file not opened yet, but comm layer tries to fetch next command)

Possible fix for #400