manually merging changes from main branch
manually merging changes from main branch

srbala/melonJS,gopalindians/melonJS,gopalindians/melonJS,melonjs/melonJS,MarkoIvanetic/melonJS,srbala/melonJS,rlugojr/melonJS,melonjs/melonJS,rlugojr/melonJS,gopalindians/melonJS,TukekeSoft/melonJS,TukekeSoft/melonJS,TukekeSoft/melonJS,Smoss/Enoru-eco,srbala/melonJS,MarkoIvanetic/melonJS,rlugojr/melonJS,Smoss/Enoru-eco