onearticle timeline working
Merge branch 'addisonBranch'

Conflicts:
	app/modules/articles/onearticlecontroller.js
	backend/requestHandler.js