Merge pull request #17 from BeeFramework/master

20121226日Dev代码归并
remove .DS_Store and .idea/
Merge branch 'master' into dev