merge

merge master
Revert "merge"

This reverts commit 091c6214e1e9eba6ed59660c3f78d356f5abe786.
Merge branch 'testbranch' of https://github.com/WhiteCusp/JQFree.js into testbranch