Fixed conflicts from upgrading to android studio 1.0, hopefully this doesnt explod everyone else. ALso fixes some bugs with the user badges.