fix merge conflicts

change from serialized hash tp just using includes

public_plans view according to gettext. DMPRoadmap/roadmap#167

I18n replaced from models. DMPRoadmap/roadmap#98

timestamp off updated_at rather than created_at plus other tidying up

reinstate funder_id used in create plan

Chnage progress bar to reduce num queries. Fixes DMPRoadmap/roadmap#103

sort out post merge issues

fix up post merge errors

mege in head changes

trying to reduce data access queries. Needs more work

finalized helper tests. additional tweaks to Plan tests

updted some stale references to Project and Dmptemplate. built more unit tests for Plan methods. Commented out a lot of methods that appear to be unused

Merge branch 'final_schema' of https://github.com/DigitalCurationCentre/roadmap into final_schema

move plan list settings from project to plan

added a few attributes to Plan and User attr_accessible sections

fixed a few merge conflicts

added suggested_answer unit tests and started on template unit tests

added check to role that sets access by default. added unit tests for section

fixes post merge

merge in changes from origin

first port of plan creation and editing to new data model

added initial unit test for plans. will hold off on finishing

removed Fileupload object since its not referenced anymore. removed all of the empty test/unit/helpers files

updated some of the plan.rb model to deal with outdated calls to dmptemplate. fixed up answer unit tests and added some validations to Answer

added new seed file that works with new schema. commented out plans and answers for now though because plan model is unfinished

resolved merge conflicts

merged final_schema changes into visibility

updated attr_accessible lines to allow mass assignment of associations via object instead of id

added unit test for exported_plan. added validations to exported_plan and has_many side of relationship to user and plan