Updated service, controller, view and json files for journals
Fixed typo that caused error in journals/id
Resolved conflicts for merging master and journal branch