- demo js & php updates
Merge remote-tracking branch 'origin/master'