added some login features
merging with development
changed migration files