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
Hide mouse cursor in full screen mode
Better Align OK/Back button
Rename 2X Render Resolution to "Anti-Aliasing" for Andriod/iOS
Better alpha component fix for xbrz
Adapt non-windows UI to new config names
Final Hybrid scaling adjustments & remove debug output
Fixed merging messup
Minor fix
Fix name collision when building on Windows. Was preventing Blackberry from building.
Avoid name collision with StringUtil on Windows hosts. Fixes all Linux/Unix cross-compiles from Windows, including Harmattan and Blackberry.
Avoid name collision with ThreadPool on Windows hosts. Fixes all Linux/Unix cross-compiles from Windows, including Harmattan and Blackberry.
Convert colors before applying clut, not after.

No reason to build it wrong and fix it afterward.