final
Merge branch 'master' of https://github.com/sergioCoritel/NewCodingtonWeb
database and changes
Merge branch 'database'