[ARQSI] - Resolve Conflits
Merge branch 'master' of https://github.com/1101516DanielBento/Think-Code

Conflicts:
	WebSite/SocialGameWebSite/Web.config