[CHANGES] rm unused images and partials
Merge branch 'master' of https://github.com/xuwupeng2000/jiangnan

Conflicts:
	app/assets/images/coffee.png
	app/assets/stylesheets/abstract.css.scss
	app/views/pages/_features.html.erb
[ADD] favicon