Fix for restart in ad-hoc mode
Merge remote-tracking branch 'origin/master'

Conflicts:
	manifest
remove zips from gitignore
add the binary module