Merge branch 'devel'

Conflicts:
	src/octopi
Merge branch 'devel'
Add HAProxy support, remove iptables routing, keep NAT. Add Certificate generation. Remove scratch package.
Remove more of scratch
Merge branch 'haproxy' into devel
Change logo not to include Raspberry Pi trademark
Merge branch 'devel'

Conflicts:
	src/octopi
Incrementing version to 0.7
Merge branch 'devel' into pyserial