embedded maps fixed
Merge branch 'developer/davidsingal' into dev

* developer/davidsingal:
  embedded maps fixed
linos class
Merge branch 'dev' into production

* dev:
  linos class
  embedded maps fixed