all status
all
sync
mac os x dome
all dome
dome
20140423
20140423
20140424
20140424
Merge branch 'master' of https://github.com/pkeros/midWechat

Conflicts:
	application/controllers/Index.php
	config/application.ini
	public/.htaccess
	public/index.php