aaa
Merge branch 'master' of github.com:lamperwang/dushuba

Conflicts:
	log/development.log
Merge branch 'master' of github.com:lamperwang/dushuba

Conflicts:
	Gemfile
	log/development.log
aaa