Merge branch 'dev'
Added working map to promise page
Merge branch 'master' into dev
Removed pop-up from map
Merge pull request #3 from alexishope/dev

Added working map to promise page