resolve merge conflicts and add nav bar in admin
Merge branch 'admin' of https://github.com/Shvarts/Cashhoppers into admin
create ad in hop_show