dev
Merge branch 'dev' of github.com:lucasrosa90/TectrendCMS into dev