Merge pull request #1 from haidaochen/master

Pulled at 2013-06-08 16:40:27 by kpm
add build files
Merge pull request #2 from sirzxj/master

Auto merge by kpm server
Merge pull request #2 from kissygalleryteam/master

build