Merge branch 'master' into 'master'

Add section about embedding websites inline in maps + corrected 'objectgroup' layer to 'object layer'

See merge request !78