#36 Allow extending map options from config file
#14
#36
Merge branch 'master' of https://github.com/getsmap/smap-mobile

Conflicts:
	configs/kartdagar_malmo.js
cleaning up