Put in a done button. Put in an edit icon.
Merge remote-tracking branch 'origin/development' into development