Removed db attempt, added js for ajax
Merge branch 'master' into old-state