Fix command line tests
adjust .gitignore
Merge branch 'master' into dev

Conflicts:
	.gitignore