Preparing to merge
Merge branch 'master' of https://github.com/ctmanuel/JapanMQP

Conflicts:
	MQP/MQP/Multiplayer.h