Updated Netbeans Project with License Template
Trying generic event handling
Merge origin/master

Conflicts:
	.gitignore