couple bundle knotebook manage bugs
robots, nginx
Merge branch 'master' into maintenance

Conflicts:
	server/gunicorn.sh
	server/nginx.conf