Merge branch 'refs/heads/master' into kontem
ajax fix
Merge branch 'refs/heads/kontem'