fixed merge conflicts in trucks index
fixed merging conflicts in truck index
changed the trucks show page to only show cash visa etc if true
Merge branch 'develop' of https://github.com/soolaimon/mobile_noms into develop