Merge origin/master

Conflicts:
	NSADatabase
	dbTest