CCModuleViewController Updated
Merge branch 'master' of https://github.com/Echx/CapCalc

Conflicts:
	CapCalc/ViewController/CCModuleViewController.h
	CapCalc/ViewController/CCModuleViewController.m