merged development into annotations

updated references of suggested_answer to annotations

fixed tests

fixed merge conflicts

added new create plan page

fixed merge conflict in schema.rb

updated models to relfect new name for join table between plans and guidance groups. fixes #198

added line to convert User to User.id on plan role assignment functions

Removed exclamation mark from uniq as it modifies the variable directly (instead of copying) and returns nil instead of an empty string if the array is empty

ensure correct guidance groups display for plan editing

fixes guidance group selection for plans

assign permissions on create plan. Fixes: #220

remove some old code

Add messages to create plan explaining decisions. Fixes https://github.com/DMPRoadmap/roadmap/issues/207

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