version 1.0
info
Merge branch 'master' of https://github.com/charmer21/www

Conflicts:
	caches/error_log.php
	phpcms/templates/default/content/show_coalbuy.html
	phpcms/templates/default/content/show_coalsale.html
	phpcms/templates/default/content/show_spline.html
	phpcms/templates/default/content/show_transportation.html
	statics/css/info.css