dasdasf
Merge branch 'master' of https://github.com/jonathanbugs/caderode

Conflicts:

templates_c/42c39aa80c66911ff710ce549df5ddc9ec237d43.file._rodape.tpl.ph
p

templates_c/45d57b6fb3247dfb5046d6b5c95f1b752caa1b31.file.erro-js.php.ph
p
	templates_c/7b9331a1b79c2af12eb8cdecd4323cbd20e19b3b.file._topo.tpl.php

templates_c/8739f5248c75c707036968391c31e4d7a81d3dbd.file.linha-cadeiras
-detalhe.tpl.php

templates_c/9206ffe216f3f7c2e7655782292928f7d20e8be5.file.footer.tpl.php

templates_c/942d7b99a33227ecc79e4ed1790b394ca4ab0fae.file.linha-cadeiras
.tpl.php

templates_c/a7749c6834b669ba7ed8349d2f905ac1d61b7c3a.file.inicial.tpl.ph
p

templates_c/be439f82a4dbec61746f62a0df07c19a7eecd966.file.header.tpl.php