Merge remote-tracking branch 'upstream/develop' into develop

grab
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop

mmmmmmm
Merge remote-tracking branch 'upstream/develop' into develop

balls
Merge pull request #77 from Icarurs/develop

Get rid of avatar upload shit
Beginnings of albums
dashboard display
Added user ids into albums
Added albums controller
images shit
Merge pull request #79 from MarwanNakhaleh/develop

dashboard image crap whatever link crap
Added basics to album controller
Added some album basics
typos
typos
Merge pull request #80 from MarwanNakhaleh/develop

typos
just fixing this now so we don't forget later
Added album view
Merge pull request #81 from MarwanNakhaleh/develop

just fixing this now so we don't forget later
Added Album groups on user profile page