Adaptation for 640
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/css/640.less