qipost/branch-merge — pull request #2 by lawrenceqin (2012-10-13 03:10:39+00:00)
Title: Update nightly

* Add feature 4, 5, 6