[Bugfix] bugfix

Conflicts:

	app/stylesheets/compass/sass/modules/_doraemon.scss