Merge branch 'devel' of https://github.com/foosel/OctoPrint into fix/sdFileList
Merge branch 'devel' of https://github.com/foosel/OctoPrint into fix/sdFileList

Conflicts:
	src/octoprint/util/comm.py
Gaah, still don't know how to cleanly merge conflicts. Fixed.
Added .g to isGcodeFileName
Merge branch 'fix/sdFileList' into devel