[Bugfix] WANDOUJIA-7829
Merge pull request #53 from lixiaopeng/release/po

[Bugfix] WANDOUJIA-7829
[Bugfix] bugfix
Merge pull request #54 from lixiaopeng/release/po

[Bugfix] bugfix
add base for build
rm leyu
fix '' for sh
fix bug in grunt build for base
safe build check and rm nouse nlss put
change build for i18n pkg

Conflicts:
	app/stylesheets/compass/images/common/misc/connecting.png
	app/stylesheets/compass/images/common/misc/disconnected.png
	app/stylesheets/compass/images/common/misc/logo.png
	app/stylesheets/compass/images/common/misc/usb-error-tip.png
	app/stylesheets/compass/images/common/misc/usb-tip.png
	app/stylesheets/compass/images/common/misc/white-close-active.png
	app/stylesheets/compass/images/common/misc/white-close-hover.png
	app/stylesheets/compass/images/common/misc/white-close.png
fix bug and rm two log
Update contact.json
Update contact.json
fix path wrong

Conflicts:
	app/stylesheets/compass/sass/_layout.scss
Update misc.json
Conflicts:
	app/nls/en-us/misc.json
Update misc.json
fanyi
add fanyi from s

Conflicts:
	app/nls/en-us/misc.json
change sp four card text
change photo to youtube