Fixed order of edit items and add AM/PM identifiers for cigarette smoked time
Merge branch 'develop' of https://github.com/amyschmidt/Tracker into develop