updates to the database
Merge remote-tracking branch 'origin/master'

Conflicts:
	RTN.SMaRTTools/RTN.SMaRTTools.UI.csproj