small fixes
edited help
Merge branch 'master' of https://github.com/cg-cnu/mariScripts

Conflicts:
	marenamer.py