Merge upstream/master

Conflicts:
	TenisApp/nbproject/private/private.xml