fixed issue #46 & small record category fix
fix conflict

Conflicts:
	Source/Display/Interfaces/Edit.cs