…selected-index-fix
* 'master' of https://github.com/rpetrich/AQGridView:
show correct number of columns when just one row
save the updated index returned when willSelectItemAtIndex is overriden
Fix divide by zero in -[AQGridView numberOfItemsPerRow]
Conflicts:
Classes/AQGridView.m

…ing-support
* 'master' of git://github.com/catlan/AQGridView:
add editing support
add indexForCell
FIX: gridView isn't scrollable when the number of items fits into its view area
FIX: gridView isn't scrollable when the number of items fits in the viewable area
add selectionGlowShadowRadius property

…to extendable-background-view
* 'master' of git://github.com/gravitymobile/AQGridView:
Added support to extend the backgroundView up or down independently to make it visible through a UIScrollView bounce.
Conflicts:
Classes/AQGridView.m