Merge branch 'master', remote-tracking branch 'origin_www' into gupia_ola
wtf
we can get and show user data \o/
merge fuckup