bug fix
Merge branch 'master' of github.com:OOKB/grad-show-2015
Merge branch 'master' of github.com:OOKB/grad-show-2015
Merge branch 'master' of github.com:OOKB/grad-show-2015
use cx func directly, not via addons.
Merge branch 'master' of github.com:OOKB/grad-show-2015