Fixed links. Order article lists by last update date
Merge branch 'master' into orderLinks

Conflicts:
	app/controllers/articles_controller.rb