Fixed star layer
Added level2, changed naming scheme
Merge remote-tracking branch 'origin/master' into devjason
fixed layer names