minor updates
Merge remote branch 'origin/client_changes'

Conflicts:
	Samurai.Database/Samurai.Database.dbmdl
twitter client