add network to principal model
send correct mime type for .js clients
Merge remote-tracking branch 'upstream/master'