[Metin2 -7] After the User log in to the account he must be able view both the player and his details.
[Metin2 - 7 ] After the User log in to the account he must be able view both the player and his details.
Resolved Merge Conflicts
Merge branch 'development' into Metin2-7

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/players.css
	app/views/users/new.html.erb
Merge pull request #8 from Kedarnag13/Metin2-7

[Metin2 - 7] After the User log in to the account he must be able view both the player and his details.