uc
Merge branch 'master' of github.com:usual2970/bikemap_yaf

Conflicts:
	data/smarty/compile/%%0C^0CB^0CB6132C%%footer.phtml.php
	data/smarty/compile/%%B3^B32^B32CDD25%%index.phtml.php
fiux