Merge pull request #5 from elemento15/development

Generic modules for Index and Form