Added location field to journal entries.
Merge remote-tracking branch 'origin/master'