Merge branch 'features/map' of github.com:simbiotica/iom into features/styles
admin images
styles
Merge branch 'features/dynamizator' of github.com:simbiotica/iom into features/styles
styles
Merge branch 'features/map' of github.com:simbiotica/iom into features/styles
follow us
location template
Merge branch 'features/styles' of github.com:simbiotica/iom into features/dynamizator
follow us
map
map
Merge pull request #14 from simbiotica/features/dynamizator

templates
resolve conflict
styles
Merge branch 'dev' of github.com:simbiotica/iom into features/styles
styles
map controls
Merge pull request #15 from simbiotica/features/styles

Maps styles and content styles
Merge branch 'features/styles' of github.com:simbiotica/iom into features/map