ds
Merge branch 'master' of https://github.com/mdxys/commentparse

Conflicts:
	nale/config/nale/shell.conf
	nale/src/tool/nale/tools/cmdLine/cmds/ScanCmd.java