commit
Merge branch 'master' of https://github.com/gliSviluppatoriS/CryptoHelper

Conflicts:
	nbproject/private/private.properties