vp请客2014
Merge branch 'vp' into gh-pages

Conflicts:
	index.htm
fixed bugs