Merge pull request #189 from chuckdumont/master

Updates to allow aggregator to host non-aggregated app resources.
$NON-NLS$ tag fixes
Merge pull request #194 from chuckdumont/master

$NON-NLS$ tag fixes
Merge remote-tracking branch 'jaggr/master' into temp