modify models
Merge branch 'develop' of github.com:stdrickforce/inori into develop

Conflicts:
	inori/models/__init__.py