Fix compilation for mac version. Nov
more fix for mac version
Merge branch 'ipont.kilnhg.com/master'

Conflicts:
	UIKit/Classes/UIColor.m
	UIKit/Classes/UIImage.h
	UIKit/Classes/UIImageView.h
	UIKit/Classes/UINavigationController.h
	UIKit/Classes/UITabBar.h
	UIKit/Classes/UITableView.h
	UIKit/Classes/UIToolbar.h
	UIKit/Classes/UIView.h
	UIKit/Classes/UIViewController.h