trying to fix pages
Merge remote-tracking branch 'origin/typescript' into typescript

Conflicts:
	dist/scripts/os/memoryManager.js