fast
merge commit
123
Merge branch 'master' into localNewMaster

Conflicts:
	TestingApp/WebContent/secured/user/article_edit.xhtml
	TestingApp/src/bean/ArticleController.java