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)
basic travis config
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)
Extracted all used regexes in the comm layer and precompiled them

Possible improvement of #390
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
Merge pull request #1 from foosel/devel

Update fork
Merge branch 'master' into staging

Conflicts:
	run
	src/octoprint/util/comm.py
Only list those SD files that have a ASCII filename

 According to the RepRap protocol we should actually not ever get anything other than those anyways, as the protocol is defined as ASCII-only. In the future there might be a way to somehow handle such files too, for the time being this fixes issues though where non-ascii files on the SD made the whole SD file handling not work.

 Closes #381
(cherry picked from commit b115b6f)
Fixed a regex matcher
(cherry picked from commit 8fbb304)
Merge pull request #2 from foosel/devel

Devel
Should resolve #402 (only for cicular beds)
origin is "sd" for files from the SD card, not "sdcard".

Fixes #411