primeiro commit
Merge master into teste

Conflicts:
	composer.json
	module/Application/Module.php
	module/Application/config/module.config.php
	module/Application/language/ar_JO.po
	module/Application/src/Application/Controller/IndexController.php
	module/Application/view/error/index.phtml
	module/Contato/Module.php
	module/Contato/config/module.config.php
	module/Contato/src/Contato/Controller/HomeController.php
Merge origin/master

Conflicts:
	README.md