ajax and friends
Merge branch 'master' into przemek