merge
Merge branch 'brayan.dev' of https://github.com/all-boilerplates/pyro-v2
Primera fase de maqueta
Merge branch 'master' of https://github.com/brayanacebo-boilerplates/pyro-v2

Conflicts:
	system/cms/cache/default/navigation_m/0aee76fc1424ace0aa39e8da4da9e7c03e1f632d.cache
	system/cms/cache/default/navigation_m/15c907d312fb65edce88007882c392caa07d381e.cache
	system/cms/cache/default/navigation_m/46f3a27c71d01bd4eb8cfb0b655bc9c665b4e059.cache
	system/cms/cache/default/navigation_m/97bcce34e5ba4388861232ad4ee20ff4ffc37927.cache
Preparando merge con javier V 0.1 back
Merge branch 'master' of https://github.com/all-boilerplates/pyro-v2 into brayan.dev

Conflicts:
	system/cms/cache/default/navigation_m/0aee76fc1424ace0aa39e8da4da9e7c03e1f632d.cache
	system/cms/cache/default/navigation_m/46f3a27c71d01bd4eb8cfb0b655bc9c665b4e059.cache
	system/cms/cache/default/navigation_m/97bcce34e5ba4388861232ad4ee20ff4ffc37927.cache
	system/cms/cache/default/page_m/342ddf6b4185a9d011df0515492f5f03b0c2f833.cache
	system/cms/cache/default/page_m/f0ca142041f6c8dfc1e95783ef567437bf08e337.cache