fixed map controller
resolved merge conflicts in application & index erb's