Encryption marche
ATTENTION BD RESET
Merge remote-tracking branch 'origin/Trunk' into Trunk

Conflicts:
	NSMDatabase