2013-9-29 12:28
Merge branch 'master' of https://github.com/kiat-mao/shpost_express_message

Conflicts:
	log/development.log
	tmp/pids/server.pid