:
Merge branch 'master' into fntsrlike

Conflicts:
	game/scene/scene_title.lua
Testing Passing All
Merge branch 'master' into fntsrlike
Merge branch 'master' of https://github.com/raincole/isr into fntsrlike
change unlock  to normal