Now removed the right file

yep right file
Merge remote-tracking branch 'origin/gh-pages' into typescript

Conflicts:
	dist/scripts/os/memoryManager.js
Merge remote-tracking branch 'origin/typescript' into typescript