PHP/JS integration v1
fixed merge conflict; PHP/JS integration v1