added gallery logic
Merge
fixed join screen for no social network
added functionality for user gallery
Merge branch 'develop' of https://github.com/Lexiren/NescafeBrownSugar into develop