move post_toJson method to helper update google_map.js
Resolve merge conflict
the map on the chapter show page now displays the posts from that chapter
 splits the fetured trips on the welcome page into two columns
fix conflicts