Czml layers

Biggest change is that uriQuery.queryToObject no longer fails when there are no query parameters passed.

Also had a merge with master with quite a few conflicts, so want to make sure I got that merge right.