Less scary message with Ctrl-C, remove gcode viewer for android
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)
Log tab added to download and remove logs
basic travis config
fix up urls in API example requests
fix crash when getStartTime() returns None
correct response code for connection success
Merge pull request #379 from MissionSt/api-doc-fix-connect

API Doc: Fix response status code for connection POST success
Merge pull request #377 from MissionSt/api-doc-fix

Fix urls in connection API examples
Merge pull request #378 from MissionSt/fix-time-crash

fix crash when getStartTime() returns None
Merge branch 'devel' into jamesgao-devel

Conflicts:
	src/octoprint/server.py
Moved "Less scary error message" patch to new location