Edited .gitignore file for Acquia Dev Desktop local sites
Merged changes from origin/develop
Merge branch 'develop' of github.com:philalonso13/BaM1 into develop