DRMP: Use LocationSelector2 for Offices (added support for Street Address
& no Map)
Merge branch 'master' of git://github.com/nursix/eden