Merge pull request #46 from krofna
Merge branch 'refactoring' of https://github.com/DHrpcs3/rpcs3

Conflicts:
	rpcs3/Emu/GS/GL/GLGSRender.cpp