Merge pull request #19 from amcgowanca/7.x-1.x

Updated version of contributed modules
Added patch for conditional_fields for feature render and rebuild alter.