Updated map
Updated mockups
Merge branch 'master' of https://github.com/Highvolt/FEUPdemic