Added calculator buttons.
Added back infoLabel.
Merge branch 'calc_base'

Conflicts:
	ios/MicroCal/MicroCal/MiCalViewController.h
	ios/MicroCal/MicroCal/MiCalViewController.m
Merge branch 'calc_base'
Changed infoLabel background color.  Fixed iPhone.xib issues.