added if markers before bounds in map.js
created markers description div on show page
Merge branch 'master' into maps_bj
added single marker to map
fixed merged master conflict