solved merge conflicts
added untracked files
readme updated
adicionado indices de tabela faltosos
removed unused locales files
manual updated
removed unused script
added files to git repository