Update of SIBAConflictArticle.
Merge branch 'master' of ssh://github.com/atarba/mdm