Merge pull request #1 from gone369/master

removed bad trunk
Merge pull request #2 from gone369/group2

merge group2 to master