qipost/branch-merge — pull request #1 by lawrenceqin (2012-10-13 03:07:27+00:00)
Title: Update upstream

* Add feature 4, 5, 6