Mockups v2 and accompanying resource files
Merge branch 'feature/pretty_ui' into develop