Merge pull request #24 from FWAJL/master

Master to DEV
Manage locations: Remove link from left menu
Remove fixed positioning from main content in connected
Merge pull request #25 from FWAJL/Development

Development