fix views
fix MzGridView
fix model
Merge branch 'develop'