CG-CamSys/oneclick — pull request #168 by quinn (2014-08-17 03:49:28+00:00)
Title: Round1 critical

merge critical items