Added parent and child references in ac model
Added pk to form so we can know what an ac edit is based on
Added merging
Fixed bug in tmp deletion
added utf-8 handling in merge3, fixes #33
Merge pull request #32 from stianjensen/editconflicts

Editconflicts