Resolving merge conflicts in schema.rb
Cleanup and restricting translations to login
Removing unnecessary files