inicial
Atualização
(v.1.0.1)
Merge origin/master

Conflicts:
	2014/.htaccess
	2014/ADMIN/error_log
	2014/ADMIN/includes/editor-banners.php
	2014/bkp/totalfes_db2014.sql
	2014/conf/funcoes.php
	2014/css/layout.css
	2014/index.php
	2014/js/custom.js
	2014/nbproject/project.properties
	2014/view/coberturas.php
	2014/view/inc_capa.php