remove useless uiview class
Merge branch 'master' into ishtar

Conflicts:
	Calculapang.xcodeproj/project.pbxproj
	Calculapang/CalculapangView.h
	Calculapang/CalculapangView.m
	Calculapang/CalculapangViewController.m