Update .gitignore
Update .gitignore 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	nbproject/private/private.xml