Less scary message with Ctrl-C, remove gcode viewer for android
Merge branch 'devel' into jamesgao-devel

Conflicts:
	src/octoprint/server.py
Moved "Less scary error message" patch to new location
There's now a different mechanism in place to prevent mobile browsers from crashing on large gcode files being visualized
Merge remote-tracking branch 'origin/devel' into devel