New option "swallowOkAfterResend" for Repetier, changed initial linenumber for serial comm to 1
Merge branch 'devel' into repetier

Conflicts:
	octoprint/settings.py
Fixed merge error
Allow switching off the heaters via the profiles again

Closes #240
Merge branch 'repetier' into devel