stash before merge to single github
broken delete ajax functions
merge conflicts resolved