resolved conflict
[Metin2 - 12] User when he clicks on a particular player in the ranking section
[Metin2-12] Merge conflict resolved.
Merge branch 'development' into Metin2-12

Conflicts:
	app/assets/javascripts/validation.js
	app/assets/stylesheets/players.css
	app/controllers/sessions_controller.rb
	app/controllers/users_controller.rb
	app/mailers/user_mailer.rb
	app/views/layouts/_header.html.erb
	app/views/user_mailer/registration_confirmation.html.erb
	app/views/users/new.html.erb
[Metin2 -12 ] User when he clicks on a particular player in the ranking section
Merge branch 'development' into Metin2-12

Conflicts:
	app/assets/javascripts/validation.js
	app/views/users/new.html.erb
Merge pull request #14 from Kedarnag13/Metin2-12

[Metin2 - 12] User when he clicks on a particular player in the ranking section