fix encoding
Merge remote-tracking branch 'origin/master' into UserRoleEncoding

Conflicts:
	src/PrizmMainProject/Forms/Settings/SettingsXtraForm.Designer.cs
encoding fix after merge
Merge remote-tracking branch 'origin/master' into UserRoleEncoding
add restriction for AddPipe to Railcar
role encoding fix
combine RailcarRepo & PipeRepo in one proxy RailcarRepositories

fix UnitTests
add pipe to Railcar restrictions
Merge remote-tracking branch 'origin/master' into RailcarShip

Conflicts:
	src/PrizmMainProject/Forms/Settings/SettingsXtraForm.Designer.cs
	src/PrizmMainProject/PrizmModule.cs
	src/PrizmMainProject/Properties/licenses.licx
fix shipping date add pipe count restriction
shipping button restriction
restriction for railcar empty number
extract hardcoded text to Resources
Merge remote-tracking branch 'origin/master' into RailcarShip

Conflicts:
	src/PrizmMainProject/Properties/licenses.licx
Merge pull request #234 from olga-jane/RailcarShip

Railcar shipping