added nbproject
Fix merge conflicts
Update js.php
Merge branch 'master' of https://github.com/arthurvr/js.php