Crypto Dev
Merge branch 'develop'

Conflicts:
	SGDA
	SGDA/Crypto.vb
"