Merge pull request #1 from joeyzhang1989/master

fix errors
Map File Format Change

Some change on the map template file
Merge branch 'zz_local'
add new classes

add two classes MainScene and NewMapScene class to Scene package
Merge pull request #1 from alexwolfwang/develop

add new classes
Merge pull request #2 from alexwolfwang/master

add new classes
Merge remote-tracking branch 'upstream/master'