[Zhenghan] Sort by time & by likes. Small improvements.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/js/controllers.js
	app/partials/around.html
	app/partials/idea.html