Adding ajax stuff
Merge branch 'master' into More_User_Dev