#! fix for android 2.3
Merge branch 'master' into jasmine-test
Merge branch 'jasmine-test' of https://github.com/jerrymf/JAX2 into jasmine-test

Conflicts:
	lib/jax-minified.js