roll back
Merge branch 'master' of https://github.com/delguoqing/PyLMPlayer

Conflicts:
	.gitignore
	packages/pack100/ENSO_UP_BG_04.py
	packages/pack101/ENSO_UP_BG_05.py
	packages/pack102/ENSO_UP_BG_06.py
	packages/pack103/BG_SAB_EFFECTI.py
	packages/pack103/ENSO_UP_BG_07.py
	packages/pack104/BG_SAB_EFFECTI.py
	packages/pack104/ENSO_UP_BG_08.py
	packages/pack105/BG_SAB_EFFECTI.py
	packages/pack105/ENSO_UP_BG_09.py
	packages/pack106/BG_SAB_EFFECTI.py
	packages/pack106/ENSO_UP_BG_10.py
	packages/pack107/ENSO_UP_BG_11.py
	packages/pack108/ENSO_UP_BG_12.py
	packages/pack109/DANCE_BG_01.py
	packages/pack110/DANCE_BG_02.py
	packages/pack111/DANCE_BG_03.py
	packages/pack112/DANCE_BG_04.py
	packages/pack113/DANCE_BG_05.py
	packages/pack114/DANCE_BG_06.py
	packages/pack115/DANCE_BG_07.py
	packages/pack116/DANCE_BG_10.py
	packages/pack117/DANCE_BG_11.py
	packages/pack118/DANCE_BG_12.py
	packages/pack119/DANCE_BG_13.py
	packages/pack120/DANCE_BG_14.py
	packages/pack121/DANCE_BG_IDOL.py
	packages/pack122/DANCE_BG_MONHAN.py
	packages/pack123/DANCE_BG_FRENESI.py
	packages/pack124/DANCE_BG_MIKU.py
	packages/pack125/DANCE_BG_RYU.py
	packages/pack196/PLAYER_SELECT_BG.py
	packages/pack196/SONG_SELECT_BG.py
	packages/pack201/CROWN.py
	packages/pack352/DANCE_IDOL_HARUKA.py
	packages/pack352/DANCE_IDOL_HIBIKI.py
	packages/pack352/DANCE_IDOL_MAMI.py
	packages/pack352/DANCE_IDOL_MIKI.py
	packages/pack352/DANCE_IDOL_TAKANE.py
	packages/pack355/DANCE_MIKU_01.py
	packages/pack355/DANCE_MIKU_02.py
	packages/pack355/DANCE_MIKU_03.py
	packages/pack355/DANCE_MIKU_04.py
	packages/pack355/DANCE_MIKU_05.py
	packages/pack357/FEVER_01.py
	packages/pack359/FEVER_IDOL.py
	packages/pack363/DON_COS00_DIET.py
	packages/pack37/SONG_SELECT_EASY.py
	packages/pack37/SONG_SELECT_HARD.py
	packages/pack37/SONG_SELECT_NORMAL.py
	packages/pack37/SONG_SELECT_ONI.py
	packages/pack38/SONG_SELECT_TOP.py
	packages/pack4/SONG_SELECT.py
	packages/pack43/ONP_FLY_DON.py
	packages/pack43/ONP_FLY_DON_D.py
	packages/pack43/ONP_FLY_GEKI.py
	packages/pack43/ONP_FLY_KATSU.py
	packages/pack43/ONP_FLY_KATSU_D.py
	packages/pack44/ENSO_COMBO.py
	packages/pack44/ENSO_HITEFFECTS.py
	packages/pack44/ENSO_LEFT_DON.py
	packages/pack44/ENSO_LEFT_KATS.py
	packages/pack44/ENSO_MATO.py
	packages/pack44/ENSO_MATO_GOGO.py
	packages/pack44/ENSO_RIGHT_DON.py
	packages/pack44/ENSO_RIGHT_KATS.py
	packages/pack50/ENSO_SCORE_MAIN.py
	packages/pack51/COMBO_SPLASH.py
	packages/pack52/DON_1P_FUKIDASHI.py
	packages/pack52/RENDA_NUM.py
	packages/pack53/DON_GEKI_1P.py
	packages/pack54/IMO.py
	packages/pack63/COURSE_ONI.py
	packages/pack67/GAUGE_DON_E.py
	packages/pack69/GAUGE_DON_H.py
	packages/pack84/CHIBI_TAMA_01.py
	packages/pack85/CHIBI_1P_IDOL_01.py
	packages/pack85/CHIBI_1P_IDOL_02.py
	packages/pack85/CHIBI_1P_IDOL_03.py
	packages/pack85/CHIBI_1P_IDOL_04.py
	packages/pack90/RENDA_EFFECT_HAMACHIDORI.py
	packages/pack97/ENSO_UP_BG_01.py
	packages/pack98/ENSO_UP_BG_02.py
	packages/pack99/ENSO_UP_BG_03.py
	src/py_actionscript/pspdx/BG_SAB_EFFECTI.py
	src/py_actionscript/pspdx/ENSO_BUNKI.py
	src/py_actionscript/pspdx/ENSO_BUNKI_MOJI.py
	src/py_actionscript/pspdx/ENSO_FULLCOMBO.py
	src/py_actionscript/pspdx/ENSO_HITJUDGE.py
bug fix

include `py_actionscript` in resource folder.