avatar mods to controller in correct spot, i hope
Merge remote-tracking branch 'upstream/develop' into develop

filezzzz
well shit, let's try editing the avatar stuff for the controller and everything like this... why, devise, must you be so... what's the word...
Merge pull request #27 from MarwanNakhaleh/develop

avatar mods to controller in correct spot, i hope