Fixed markup, and added missing content.
Updated the China PHP Conference information, as requested by Xinchen Hui