junk
Merge branch 'master' of https://github.com/hptme/jinling

Conflicts:
	app/views/shared/_slider.html.erb