fejl
Merge remote-tracking branch 'origin/master'
Added map for Mapview controller and changed contaKtview to contaCt in 3 instances