Refactored Texture Scaling, changed options & gui to separately select scaling level and method
Added functionality for hybrid scaling (not yet working)
Manual merge
xbrz: fixed byte order, made distance function alpha-aware
Hybrid scaling works now
Merge
remove outdated config parameters
Merge branch 'master' of https://github.com/hrydgard/ppsspp

Conflicts:
	Core/Config.cpp
	Core/Config.h
Better alpha component fix for xbrz
Adapt non-windows UI to new config names
Final Hybrid scaling adjustments & remove debug output
Fixed merging messup
Removed Bilinear texture filtering option
Merge pull request #1640 from PeterTh/master

Texture scaling improvements