add ajax
Merge branch 'master' into foundation

foundation branch has taken the role of master
clean up code