Merge origin/master

Conflicts:
	digitalSafe.safe
Latest build.