test
remote test
fix issue with prepare Model in the view
Merge branch 'dev'