merging changes from pull request
Merge branch 'brucellino-master' into dev
Merge pull request #3 from AAROC/dev

core and site playbooks