updated submodules...
Merge branch 'master' of github.com:geoadmin/mf-next

Conflicts:
	geoadmin/static/lib/ol3