Merge branch 'develop' of https://github.com/Regalis/Jamii into develop
Merge branch 'develop' of https://github.com/ArianaLas/Jamii into develop
Attached the logout function to button.
Merge branch 'develop' of https://github.com/Regalis/Jamii into develop

Conflicts:
	src/srv/http/js/rest.js
Board customisation and popups
Merge branch 'develop' of github.com:matteozajac/Jamii into develop
conference invitations
Merge branch 'develop' of github.com:alekgajos/Jamii into develop