integrating ajax step 1
Merge origin/master