- add parameters config
- add nbproject to gitignore
Merge branch 'master' into develop

Conflicts:
	.gitignore