Minor changes.
Fixed conflicts.
Updated an image file.
Merge branch 'topic/isp-traffic-control'
Merge branch 'master' into topic/multichannel-scheduling
Merge branch 'topic/isp-traffic-control'
Merge branch 'master' of github.com:kyeongsoo/inet-hnrl
Merge branch 'topic/isp-traffic-control' of github.com:kyeongsoo/inet-hnrl into topic/isp-traffic-control