Fixing LIVEOAK-683
Merge pull request #401 from cardosogabriel/master

Fixing LIVEOAK-683
LIVEOAK-675: Console LiveLoader fix for same-type resources
Merge pull request #402 from vrockai/LIVEOAK-675

LIVEOAK-675: Console LiveLoader fix for same-type resources