Merge branch 'master' into mediaengine
Merge branch 'master' into mediaengine

Conflicts:
	Common/LogManager.cpp
	Core/CMakeLists.txt
	Core/Core.vcxproj
	Core/Core.vcxproj.filters
	Core/CoreParameter.h
	Core/HLE/sceAudio.cpp
	Core/HLE/sceKernel.cpp
	Core/HLE/sceKernelThread.cpp
	Core/HLE/sceMpeg.cpp
	android/jni/Android.mk
Merge branch 'master' into mediaengine
Fix bad merge in vcxproj filters file.
Cleanup some logging, return values in sceMpeg.
Use a map of mpeg handles, cleanup init/shutdown.
Cleanup init/shutdown for scePsmf.

Also fix some indentation.
Log the created mpeg handle for easier debugging.
Fix a crash in sceMpegQueryStreamSize().
Correct mpeg lookup in sceMpegRingbufferPut().
Fix crash with unitialized var in mpeg code.
Merge pull request #249 from unknownbrackets/mediaengine

Minor media engine tweaks
Merge branch 'master' into mediaengine.

Note: doesn't compile, just fixes conflicts.

Conflicts:
	Core/HLE/sceKernel.cpp
	Core/HLE/sceKernelThread.cpp
	Core/HLE/sceKernelThread.h
Add save stating changes to mediaengine.

Also makes it compile again.
Merge pull request #282 from unknownbrackets/mediaengine

mediaengine: Merge from master, add save states
Can't just do that, might get the vtbl.  Arg.
Merge pull request #285 from unknownbrackets/mediaengine

Fix mediaengine save states
Some save are smaller than the buffer. This correct K-on Houkago Live
Game which should check save size returned.
Merge pull request #326 from Xele02/master

Save / Load update
Cosmetic fix in save/load menu when line of game data info > 4