Merge branch 'rivers'
add jquery.cookie to asset management
Merge remote-tracking branch 'origin/master'
enable asset management with bower, grunt
Add JST task
Merge branch 'master' into riversyang

Conflicts:
	public/tl/js/favor.js
	views/boilerplate.ejs