Check for user object
Merge branch 'master' of https://github.com/michael-cannon/mediaburn-relaunch