Ajax and some other stuff
Merge branch 'master' into ajax_fun
moved home