Merge branch 'master' of https://github.com/lordconstant/Project-Infinty

Conflicts:
	Project-Infinty.userprefs