added primary activity_schema to condition untested
modify task.create_from_params, untested
modify seeds.rb to fit changes in condition
updated condition views, untested
switching to new branch to higher priority items
fix all spec tests
fixes most condition feature except for 1 test
merge master
unable to have two activity_schema for condition
fixes condition feature
remove activity_schema from task and fix most tests
corrected task views and fix corresponding cucumber test
merge conflict
fix bug
fix factory bug
merging condition refactor and test fixes into master