Auto-restarting server, .gitignore, old system compatibility.
Merge branch 'master' into edit-1