Merge pull request #19 from joshreed13/develop

Control Center Refactoring
Merge remote-tracking branch 'upstream/develop' into develop