OPAF CODE PUSH NO 2 MORE WORKERINOS
Merge branch 'master' of https://github.com/KevZho/xamulator

Conflicts:
	framework/app.js