Changed the way page titles, descriptions are displayed.

Updated Atom feed variable to FEED_ATOM.

Fixed bug in github link.
Merge commit '614e02e6c894281a7fea631dd5a845a00f7639d9'

Conflicts:
	templates/article.html
	templates/base.html
	templates/page.html