4 Commits (45636826ba3306f3da62709a510887ab7a32a7a5)

Author	SHA1	Message	Date
Scott Anderson	505b4eb6dd	reorganized placeholder ui content, removed ui directory	2019-01-23 09:17:16 -07:00
Scott Anderson	450b05ddf2	resolved merge conflicts	2019-01-22 17:31:18 -07:00
Scott Anderson	9357144699	resolved merge conflicts	2019-01-22 17:30:15 -07:00
Scott Anderson	bcb03eb306	structure or org and user management	2019-01-22 17:23:16 -07:00