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
Merge pull request #16 from simbiotica/features/styles

Map controls and some other menu bugs fixed
Merge branch 'dev' of github.com:simbiotica/iom into features/map
Merge branch 'features/map' into dev
Merge branch 'dev' of github.com:simbiotica/iom into features/styles