Display/hide animation of article
.htaccess file
Forbid viewing of directories
Merge branch 'master' into summaries

Conflicts:
	site/js/whileaway.js