14.11.14 - { Rodrigo Cachoeira } - Padrões Opcionais
14.11.14 - { Rodrigo Cachoeira } - Padrões Opcionais
Merge branch 'master' of https://github.com/profbruna/locadorav

Conflicts:
	application/config/config.php
Merge branch 'master' of https://github.com/profbruna/locadorav

Conflicts:
	application/config/config.php