Changeset [1a8d5e6e69e75af7cf2e68fe19494ba43aae0e4a] by Yomi Colledge

Merge branch '0.8.0' of git@github.com:baphled/salad into 0.8.0

Conflicts:

app/controllers/features_controller.rb
app/views/features/system_merge.html.erb
features/plain/updating_features.feature
features/step_definitions/patching_modified_feature_files_steps.rb
features/step_definitions/updating_feature_steps.rb
spec/controllers/features_controller_spec.rb

http://github.com/baphled/salad/commit/1a8d5e6e69e75af7cf2e68fe1949...