CCRecordView layout update
Merge branch 'master' of https://github.com/Echx/CapCalc

Conflicts:
	CapCalc/Base.lproj/Main.storyboard
Merge branch 'master' of https://github.com/Echx/CapCalc