merge upstream + fix JSObjectProxy : yourself do not work anymore

.gitignore

@@ -4,6 +4,9 @@ examples/webos/**/*.js
 
 # Ignoring compiled files in st
 st/*.js
+<<<<<<< HEAD
 
 # In case amber is also saved in a local Subversion
 .svn
+=======
+>>>>>>> upstream/master