added constants and stuff to the AJAX to make it more flexible
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'