Get Rakiya FIX and Rakia Dissappear
Merge remote-tracking branch 'origin/master'

Conflicts:
	Game/js/game.js