Joined user and pictures
upload
Added link for gallery
gallery for user and admin
Some syntax fixes
Commit
Merge remote-tracking branch 'origin/gallery' into develop