Merged pulled changes
Merge branch 'refactor_v3' of github.com:eaudeweb/cms.contacts into refactor_v3