Various fixes for ID confusion
Fixed entries being cleared when adding or removing rows
Merge branch 'master' of https://github.com/pflammertsma/Hangup.git