.
Merge branch 'master' of github.com:alexandrevicenzi/eventos

Conflicts:
	eventos/nbproject/private/private.properties