map
Merge branch 'master' of https://github.com/ditma1/japreview

Conflicts:
	lib/modules/map/lib/less/default_maps.less
Merge branch 'master' of https://github.com/ditma1/japreview

Conflicts:
	lib/modules/map/lib/less/default_maps.less
Merge branch 'master' of https://github.com/ditma1/japreview

Conflicts:
	lib/modules/navigation/lib/less/default_navigation.less
Merge branch 'master' of https://github.com/ditma1/japreview