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

Conflicts:
	data/smarty/compile/%%84^843^8438FFD7%%index.phtml.php