update local repo
Merge branch 'master' of https://github.com/nickpeppers/TheGameDB

Conflicts:
	TheGameDB.userprefs