fixed add location link on dashboard page
resolved merge conflict in app_main.js