tweak AnnotatedModel from a interface to a class.
Merge branch 'master' of https://github.com/doomdagger/s_framework