Integrating users and remove items code
Merge remote-tracking branch 'origin/master'
random merge
random stuff