Models for M5
M5 models, missing javadocs
Merge
Fixed conflicts for M5 pull