CG-CamSys/oneclick — pull request #132 by quinn (2014-03-26 15:41:08+00:00)
Title: Merge upstream develop origin cgdevelop

merged origin/cgdevelop and upstream/develop into origin/develop