fixed broken admin-link in admin-tab in backlift-reloader.js
removed backlift-reloader.js and added to config.yml as include
fixing googlemaps config merge conflict
Merge branch 'edge' of github.com:backlift/backlift-templates into edge