Added/modified a bunch of comments to ensure good documentation.
Split up the AddEntryActivity into two methods
Fixed conflicts
Added class comment to AbstractEntryEditorActivity
Fixed redundancies, got rid of uneccessary variable.
Merge pull request #146 from coldstar96/split-add-entry-activity

Split AddEntryActivity