Adds edit functionality into the AddEntryActivity
Fixed conflicts
Fixed issues and changed entry back from cloneable
Fixed conflict.
Merge pull request #105 from coldstar96/edit-entry-in-activity

Adds edit functionality into the AddEntryActivity