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

Conflicts:
	data/smarty/compile/%%2D^2D7^2D7EE354%%sinacode.phtml.php