fixes for mac build
FS mac build fixes
more mac photostackr fixes
more mac photostackr fixes
Merge branch 'ipont.kilnhg.com/master'

Conflicts:
	UIKit/Classes/UIGeometry.h
	UIKit/Classes/UIGeometry.m
	UIKit/Classes/UITableView.h
	UIKit/Classes/UITableView.m