Ajax
Fixed conflict
Merge pull request #31 from tmfroem/master

Ajax right side