0
Merge branch '20141230' of https://github.com/zhoufeng001/Live.git into
20141230

Conflicts:
	live/live-web-resource/nginx/logs/access.log
	live/live-web-resource/nginx/logs/nginx.pid
1