Merge branch 'master' into develop
Merge branch 'master' into develop
Add callback on DefaultActivity. Stop timer, and location managers
Add callback on DefaultActivity. Stop timer, and location managers
Add Details layout, activity, and 2 intents.
Add DONE/DISCARD menu items, finish up the activity.
Add comments
Merge branch 'add_details' into develop
Merge branch 'develop'