fixed ajax issue
Merge branch 'dev'