Merge branch 'layer-refactor' into development
Merge remote-tracking branch 'upstream/development' into development
trailview style fixes
Merge pull request #40 from etown/milestone-1-bugs

Milestone 1 bugs