update
Merge branch 'master' of https://github.com/tonysh518/lilyweibo

Conflicts:
	api/protected/runtime/application.log