Merge branches 'master' and 'master' of https://github.com/Roizan/com.guilded.gms.game.swtor

Conflicts:
	README.md
Readme