Refactor: simplify server error conditions, add 'Error: ' in front of all error messages from server.
Merge branch 'testing' into ajax