merge
Merge branch 'master' of https://github.com/bloomweb/calibacana
avances
Merge branch 'master' of https://github.com/bloomweb/calibacana
for merge
Merge branch 'master' of https://github.com/bloomweb/calibacana
Merge branch 'master' of https://github.com/bloomweb/calibacana

Conflicts:
	src/sites/all/themes/custom/css/pages.css
home p1