updating git repo with several changes
Merge branch 'master' of https://github.com/acquia-pso/fix-me