Updated contrib modules ctools og OG
Removed ctools patch from make file
Merge remote-tracking branch 'origin' into release