Merge this
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/index.html
	public/templates/articles/articleTemplate.html
A little tidy up