(*)update configuration
Merge branch 'master' of github.com:missdeer/KellyWechat

Conflicts:
	conf/app.conf