adding basic stuff
...
finished mainAjax, mostly. testing
small fixes
loose ends
fixing conflicts
conflcits
Merge branch 'ajax'