Merge remote-tracking branch 'upstream/master' into devel
A very simple API endpoint for loading and printing files direct. This is by default turned off and it "allowed" via the settings

From within Slic3r adding a post-processing script .bat containing

c:\curl\curl "http://192.168.0.7:5000/api/load?apikey=D96FA6A216CB44F78705D4506689D0EC&print=true" -F file=@%*
simple change so the url loads from http or https whichever is in use
Forgot to simplify the success after testing
Merge branch 'richardjm-devel' into devel

Conflicts:
	octoprint/server.py
	octoprint/settings.py
	octoprint/templates/index.jinja2
Return proper http status codes in case of problems