.
Merge branch 'master' of github.com:theraphim/smartpxe
Merge branch 'master' of github.com:theraphim/smartpxe
Merge branch 'master' of github.com:theraphim/smartpxe

Conflicts:
	server/winpe.go
.
Merge branch 'master' of github.com:theraphim/smartpxe

Conflicts:
	server/servetftp.go