Merge branch 'develop'

Conflicts:
	app/views/article/index.twig
Implemented submitting test results
Removed billing ctrl