model updae
Merge branch 'master' of https://github.com/fineday32/TempIoIo

Conflicts:
	log/development.log
log