fix #358
fix #375
Merge remote-tracking branch 'origin/master' into Issue358

Conflicts:
	src/PrizmMainProject/Forms/Railcar/NewEdit/RailcarNewEditXtraForm.cs
after merge
Merge pull request #376 from olga-jane/Issue358

Fix Railcar issues