apply commit https://github.com/oberhamsi/gamejs/commit/fdaee05a02a866f28a1f18fd8cc1b1afa01f550b
apply commit https://github.com/oberhamsi/gamejs/commit/3e2c4854a02e53c462907e4bda8c17a26469a4c6
apply game js commits to trunk