Merge commit 'a337fa' into footer-fixes

* commit 'a337fa':
  Fixed: Footer view is placed offscreen only when content size is lesser than the screen itself.
  Fixed: Footer view is shifted offscreen.

Conflicts:
	Classes/AQGridView.m

Classes/AQGridView.m

@@ -507,6 +507,14 @@ - (void) setContentSize: (CGSize) newSize
 	if ( (_flags.contentSizeFillsBounds == 1) && (newSize.height < self.bounds.size.height) )
 		newSize.height = self.bounds.size.height;
 
+	if (self.gridFooterView)
+	{
+	    CGFloat footerHeight = CGRectGetHeight(self.gridFooterView.bounds);
+	    CGFloat minimumHeight = CGRectGetHeight(self.bounds) + footerHeight;
+	    if (newSize.height < footerHeight + minimumHeight)
+	        newSize.height = minimumHeight;
+	}
+
 	CGSize oldSize = self.contentSize;
 	[super setContentSize: newSize];