#97
Merge branch 'master' of https://github.com/getsmap/smap-mobile

Conflicts:
	dist/configs/tema.js
	dist/configs/tema_adress.js