Add preliminary .feature and steps.py file for lettuce
Fix conflicts. Merge remote-tracking branch 'origin/add_edit' into add_edit
Fix functions for journal
Fix templates for editing
Modify test for get_one_entry