Data

- Resolves merge conflict with latest login changes
- Provides icons for data bricks: GH-474
- Provides strict sort order for bricks: GH-479
- Cleaned up test suite. All unit tests passing minus GH-480