Updated style to the new format, still needs a little work to have it look like it did before.
Merge commit 'b250712385c886ed8af7f1763892eff746479b54' into ol3-latest

Conflicts:
	src/common/map/MapService.js