Mattsupstream into ci_smrke

new users class and social login plus cleaning