一些修改
Merge branch 'master' of github.com:kingwon/garage

Conflicts:
	Garage/Common/Conf/db.me.php
	config.yaml