fixed typos
Merge branch 'master' of github.com:mwaylabs/TMP2

Conflicts:
	framework/modules/core/logger.js