pulling in location for edit
stab at bower
Merge branch 'bower' into 1310
wip