issue #416 - reports: fixed spacing and caption
Merge branch 'master' of https://github.com/olga-jane/prizm into Protsenko_v1
Issue #505 - audit (part2)
Merge branch 'master' of https://github.com/olga-jane/prizm into Protsenko_v1

Conflicts:
	src/PrizmMainProject/PrizmApplication.csproj
	src/PrizmMainProject/PrizmModule.cs
Small fix
Make "workstation type" name appear at the head of main screen,
Remove Завод,... from all headers of child windows
Merge branch 'master' into sidorov_WorkstationType

Conflicts:
	src/DatabaseMigrator/Scripts/fillDb.sql
eliminating wrong #ifdef
Issue #505 done for tableName field
Issue #505 done for fieldName field
Set control operation for joint in Settings
add tables and entity
Merge pull request #530 from olga-jane/Protsenko_v1

Issues #505 (audit) and #416 (small UI fixes)
the duplicated mapping have been deleted
Merge branch 'master' into sidorov_WorkstationType

Conflicts:
	src/PrizmMainProject/Properties/Resources.resx
	src/PrizmMainProject/Properties/Resources1.Designer.cs
resolve conflicts in Resources
Issue #534 - Added base entities
Merge pull request #538 from olga-jane/sidorov_WorkstationType

Make "workstation type" name appear at the head of main screen,
Merge pull request #540 from olga-jane/sidorov_NewComponentry1stPhase

Sidorov new componentry1st phase
Merge remote-tracking branch 'origin/master' into O_Morozova

Conflicts:
	src/DatabaseMigrator/Scripts/fillDb.sql