Ignore nbproject
Merge origin/develop into develop

Conflicts:
	.gitignore
commit file1
Merge master into develop
commit file2 on feature/file2