commit for Ajax changes

Commit from last weeks work. Ajax changes
commit
commit