git pull origin

git-svn-id: https://energine.googlecode.com/svn/branches/2.11.9_js_docAndRefactoring@2745 acdd3125-bb50-0410-93b3-95ffde4b7c7d
another test commit

git-svn-id: https://energine.googlecode.com/svn/branches/2.11.9_js_docAndRefactoring@2746 acdd3125-bb50-0410-93b3-95ffde4b7c7d
Another strange merge