update
Merge branch 'master' of github.com:newTopher/dlwx

Conflicts:
	protected/runtime/console.log