fixed problem with email
model initiation
Merge branch 'master' of github.com:Fattouh92/toro into hassaan