https maps and fb
Merge branch 'dev-brendon' of github.com:fightbulc/impala into dev-tino