allow config of cherrypy # threads via local_settings
fixing bug on windows script.
Slight tweaks to spacing on knowledge map topic pages.
Prevent central server and distributed server cookies from interfering.
Merge pull request #537 from jamalex/prevent_cookie_overlap

Prevent central server and distributed server cookies from interfering.
Merge pull request #536 from jamalex/collapse_exercise_layouts

Slight tweaks to spacing on knowledge map topic pages.
Merge pull request #535 from bcipolli/thread_count

allow config of cherrypy # threads via local_settings
Remove auto-killing of all other started servers, since we have PID files.
Merge pull request #538 from jamalex/stop_killing_everything

Remove auto-killing of all other started servers, since we have PID files.
Merge pull request #540 from dylanjbarth/release-0.10

Fixing broken link on register device page.
Fixing broken link on register device page.
Merged new fix with upstream release