Emma development merge into development for update from master

The Emma development branch that adds new styling has been merged into the development branch for continued work.