minor enhancements
update component model
Merge remote-tracking branch 'upstream/master'

syncin’ up
Merge branch 'master' of https://github.com/anderoonies/server