some changes in ajax
Merge branch 'dev'