Fix double inclusion of main controller for affiliate vs admin screen layout
Merge branch 'develop' of ssh://github.com/IHTSDO/MLDS into develop