add images
update styles
fixed grunt-express error
modify gruntfile
modify gruntfile
merge dev to master