Cleanup - update

Signed-off-by: Mike Tuszynski <tuzman@gmail.com>
Merge branch 'journal_v01' of bitbucket.org:teamworkouttracker/workout-tracker into journal_v01