server->ajax renaming, hopefully really last forgotten piece
Merge branch 'master' into rebuilding_arch

Conflicts:
	test/client/server_test.dart