removed add marker link
merged with master
fixed links on trip index page
changing text of markers index
fixed links for user index
fixed back links on pages