Add ability to merge entries

[dremin]

Allow merge of entries from the same project. Combine the hours and concatenate notes.