front-end files
Merge pull request #1 from faustocarrera/develop

front-end files