more checks
nginx configuration added
Merge branch 'master' of github.com:punund/nodeb

Conflicts:
	bin/make-deb.sh