MYLOC-60 - Update header + footer
MYLOC-60 - Fix header
Merge branch 'master' into user_locations_list