ariana merge
Merge branch 'develop' of https://github.com/ArianaLas/Jamii into develop
More options styles and file share styles