Remove conflicts.
Merge branch 'master' into develop

Conflicts:
	app/controllers/articles.js
	app/models/article.js
	app/routes/articles.js
	public/js/controllers/articles.js
	public/js/controllers/header.js
	public/js/services/articles.js
	test/karma/unit/controllers/articles.spec.js
	test/mocha/article/model.js