Merge branch 'develop' of https://github.com/Regalis/Jamii into develop
whiteboard colors
Merge branch 'develop' of https://github.com/alekgajos/Jamii into develop
logout and conf
Merge branch 'develop' of github.com:matteozajac/Jamii into develop
Fix in account change GUI