Fixed paths
Merge remote-tracking branch 'origin/meteor-friendly-resource-paths' into tp-v1