First
banco
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/configs/application.ini
	application/library/Zend/Controller/Front.php
	application/library/Zend/Tool/Project/Context/Zf/HtaccessFile.php
	application/library/Zend/Validate/Hostname.php
	application/library/Zend/View/Helper/BaseUrl.php