embed map code
ponto brige to embed map
address code review comments
Merge branch 'master' into MOB-1537

Conflicts:
	api/v1/render.html
MOB-1878: Fix unit tests for service
Merge branch 'master' into MOB-1537

Conflicts:
	assets/scripts/map.js
Merge pull request #93 from Wikia/MOB-1537

Mob 1537
Merge pull request #106 from Wikia/MOB-1878

MOB-1878: Fix unit tests for service
manually merged master and resolved conflicts in render.html and map.js