Merge pull request #15 from lixiaopeng/master

merge upstream master
Update .gitignore
Update RequireJS config
Fit new version of compass pre.
Fix config bug
Merge branch 'master' of github.com:wandoulabs/USB-Guide

Conflicts:
	app/compass/sass/usb-debug.scss
Fix typo.
[Change] change file path
[Feature] add cdrom