update
Merge branch 'master' of https://github.com/dreamDeng/dreamdeng.github.com

Conflicts:
	myproject/phone/style/global.css
1