dd
staged
Merge branch 'master' of github.com:yfsun/website

Conflicts:
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_en-us
	app/tmp/cache/persistent/myapp_cake_core_file_map
changed layout