Merge branch 'master' of /Users/Rainheardt/PhpstormProjects/ccm-barriles with conflicts.
step 3 almost