Merge branch 'master' of https://github.com/fallenstardust/YGOMobile-cn-ko-en

# Conflicts:
#	Classes/gframe/gframe.cpp

Classes/gframe/gframe.cpp

@@ -28,7 +28,6 @@ char* sub_string(const char* str, int start, int count=-1){
 	tmp[index] = '\0';
 	return tmp;
 }
-
 #ifdef _IRR_ANDROID_PLATFORM_
 int GetListBoxIndex(IGUIListBox* listbox, const wchar_t* target){
 	int count = listbox->getItemCount();