Layout para cada módulo
Merge https://github.com/Flavio378/ModuloInicioZF2

Conflicts:
	LICENSE.txt
	README.md
	composer.json
	config/application.config.php
	config/autoload/.gitignore
	config/autoload/README.md
	config/autoload/global.php
	config/autoload/local.php.dist
	data/cache/.gitignore
	init_autoloader.php
	module/Application/Module.php
	module/Application/config/module.config.php
	module/Application/language/ar_JO.mo
	module/Application/language/ar_JO.po
	module/Application/language/ar_SY.mo
	module/Application/language/ar_SY.po
	module/Application/language/cs_CZ.mo
	module/Application/language/cs_CZ.po
	module/Application/language/de_DE.mo
	module/Application/language/de_DE.po
	module/Application/language/en_US.mo
	module/Application/language/en_US.po
	module/Application/language/es_ES.mo
	module/Application/language/es_ES.po
	module/Application/language/fr_CA.mo
	module/Application/language/fr_CA.po
	module/Application/language/fr_FR.mo
	module/Application/language/fr_FR.po
	module/Application/language/it_IT.mo
	module/Application/language/it_IT.po
	module/Application/language/ja_JP.mo
	module/Application/language/ja_JP.po
	module/Application/language/nb_NO.mo
	module/Application/language/nb_NO.po
	module/Application/language/nl_NL.mo
	module/Application/language/nl_NL.po
	module/Application/language/pl_PL.mo
	module/Application/language/pl_PL.po
	module/Application/language/pt_BR.mo
	module/Application/language/pt_BR.po
	module/Application/language/ru_RU.mo
	module/Application/language/ru_RU.po
	module/Application/language/tr_TR.mo
	module/Application/language/tr_TR.po
	module/Application/language/zh_CN.mo
	module/Application/language/zh_CN.po
	module/Application/language/zh_TW.mo
	module/Application/language/zh_TW.po
	module/Application/src/Application/Controller/IndexController.php
	module/Application/view/application/index/index.phtml
	module/Application/view/error/404.phtml
	module/Application/view/error/index.phtml
	module/Application/view/layout/layout.phtml
	module/Inicio/Module.php
	module/Inicio/autoload_classmap.php
	module/Inicio/config/module.config.php
	module/Inicio/language/ar_JO.mo
	module/Inicio/language/ar_JO.po
	module/Inicio/language/ar_SY.mo
	module/Inicio/language/ar_SY.po
	module/Inicio/language/cs_CZ.mo
	module/Inicio/language/cs_CZ.po
	module/Inicio/language/de_DE.mo
	module/Inicio/language/de_DE.po
	module/Inicio/language/en_US.mo
	module/Inicio/language/en_US.po
	module/Inicio/language/es_ES.mo
	module/Inicio/language/es_ES.po
	module/Inicio/language/fr_CA.mo
	module/Inicio/language/fr_CA.po
	module/Inicio/language/fr_FR.mo
	module/Inicio/language/fr_FR.po
	module/Inicio/language/it_IT.mo
	module/Inicio/language/it_IT.po
	module/Inicio/language/ja_JP.mo
	module/Inicio/language/ja_JP.po
	module/Inicio/language/nb_NO.mo
	module/Inicio/language/nb_NO.po
	module/Inicio/language/nl_NL.mo
	module/Inicio/language/nl_NL.po
	module/Inicio/language/pl_PL.mo
	module/Inicio/language/pl_PL.po
	module/Inicio/language/pt_BR.mo
	module/Inicio/language/pt_BR.po
	module/Inicio/language/ru_RU.mo
	module/Inicio/language/ru_RU.po
	module/Inicio/language/tr_TR.mo
	module/Inicio/language/tr_TR.po
	module/Inicio/language/zh_CN.mo
	module/Inicio/language/zh_CN.po
	module/Inicio/language/zh_TW.mo
	module/Inicio/language/zh_TW.po
	module/Inicio/src/Inicio/Controller/InicioController.php
	module/Inicio/src/Inicio/Controller/InicioController.php~
	module/Inicio/view/error/404.phtml
	module/Inicio/view/error/index.phtml
	module/Inicio/view/inicio/inicio/index.phtml
	module/Inicio/view/layout/layout.phtml
	public/.htaccess
	public/Inicio/favicon.ico
	public/Inicio/flash/Options.as
	public/Inicio/flash/SifrStyleSheet.as
	public/Inicio/flash/avenir.swf
	public/Inicio/flash/museo.swf
	public/Inicio/flash/sIFR.as
	public/Inicio/flash/sifr.fla
	public/Inicio/images/bg.gif
	public/Inicio/images/bg.jpg
	public/Inicio/images/box.gif
	public/Inicio/images/f.png
	public/Inicio/images/field.png
	public/Inicio/images/formbg.png
	public/Inicio/images/l.gif
	public/Inicio/images/line.gif
	public/Inicio/images/line.png
	public/Inicio/images/main.gif
	public/Inicio/images/mid_bg.jpg
	public/Inicio/images/mid_bg.png
	public/Inicio/images/shadow.png
	public/Inicio/images/submit.png
	public/Inicio/images/t.png
	public/Inicio/js/Adobe_Caslon_Pro_600.font.js
	public/Inicio/js/Avenir_Next_LT_Pro_700.font.js
	public/Inicio/js/cufon-yui.js
	public/Inicio/js/sifr-config.js
	public/Inicio/js/sifr-debug.js
	public/Inicio/js/sifr.js
	public/Inicio/js/source/sifr.js
	public/Inicio/js/swfobject.js
	public/Inicio/tools/960.css
	public/Inicio/tools/sifr.css
	public/Inicio/tools/style.css
	public/css/bootstrap-responsive.min.css
	public/css/bootstrap.min.css
	public/css/style.css
	public/img/favicon.ico
	public/img/glyphicons-halflings-white.png
	public/img/glyphicons-halflings.png
	public/img/zf2-logo.png
	public/index.php
	public/js/bootstrap.min.js
	public/js/html5.js
	public/js/jquery.min.js
	vendor/.gitignore
	vendor/README.md