Merge pull request #8 from fourmackems/master

Markers Link to places page (to show media related)
switching branches
Solved errors now adding in Charlies updates
Updated code for places marker relationship also fixed JS console problems
commiting add journal entry functionality
Merged the changes and merges from the troupe
merging with ecomba
Merge remote-tracking branch 'ecomba/master' into dev2
Merge pull request #10 from KeirOsborn/master

journal entry functionality done
"slide toggles on new entry and previous entry view forms"