client error
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	webapp/myArticles.jsp