0127——2
Merge branch 'PopGlobal' of https://github.com/gamenaga/NagaLab into PopGlobal

Conflicts:
	bin/NagaLab.swc