comit
ttt
ttt
Merge branch 'master' of https://github.com/idaChile/DF

Conflicts:
	nbproject/private/private.properties