cleanup of Login Model and adding of UserLogin Model 8/18/14