#403 Convert articles into a package
Merge branch 'adrianedworthy-articles-to-package'

* adrianedworthy-articles-to-package:
  #403 Convert articles into a package
Merge remote-tracking branch 'upstream/master'

Conflicts:
	public/init.js
	public/system/controllers/header.js