Commmit
Merge branch 'master' of https://github.com/JeremyJeong/TouchMind.MP1.Media.Ajou

Conflicts:
	TouchMind.MP1.Media.Ajou/TMSocketClient/SocketIO/SocketIO.m