22222222233333333
Merge branch 'master' of github.com:maramail/yoyo1

Conflicts:
	designfile/outter-menu/Backup/20141104 110344/f_index.json
	designfile/outter-menu/Backup/20141104 110344/f_info_window_confirm.json
	designfile/outter-menu/Backup/20141104 110344/f_info_window_confirm_quest.json
	designfile/outter-menu/Backup/20141104 110344/info_window_longpressA.json
	designfile/outter-menu/Backup/20141104 110344/questmap.json
	designfile/outter-menu/Backup/NormalCloseTag.xml
	designfile/outter-menu/Json/f_story_list.json
	designfile/outter-menu/act-menu.xml.ui