Fixed models import and some notes
Merge branch 'develop' of https://github.com/dagobailon/team_noi into develop