Merge pull request #1131 from modmedia/develop

Adding fieldset to login form for framework support