Merge pull request #426 from fahadhatib/develop

Develop
Add the facility to edit someaspects of the functional currency
Merge pull request #427 from timschofield/develop

Add the facility to edit someaspects of the functional currency
Update the login page for new branding file
Merge pull request #428 from timschofield/develop

Update the login page for new branding file