dsfdsfsd
weqwe
fdsfsd
Merge branch 'dev'

Conflicts:
	hybridapp/www/js/controller.js
fsdf
fsdfs
修复bug
fdsf
fix bug
fix bug in list
Merge branch 'master' of github.com:limijiaoyin/washcar

Conflicts:
	hybridapp/www/css/app.css
	hybridapp/www/js/controller.js
Merge branch 'dev'
fdsfsd
Merge branch 'dev'