Model and view-controller of configuration completed.
Merge remote-tracking branch 'origin/master'