flash notice fading in and out working, updated users controller and markets index and show
resolved merge conflict in map.js