Added player weapon
Merge remote-tracking branch 'origin/master'
Added project settings to contains lignings tweakings