Merge origin/master

Conflicts:
	Bounties/lib/nblibraries.properties
	Bounties/nbproject/project.properties
Merge origin/master
Merge origin/master

Conflicts:
	Bounties/lib/nblibraries.properties
	Bounties/nbproject/project.properties