Finished config armario and add padrao and voltar to all templates
Merge branch 'master' of github.com:nishi13/smart_closet

Conflicts:
	sistema/templates/combinacao.html