installed new gem pundit

updated seeds file

finished implimenting new authorization scheme in dmptemplates

updated organisation edit page's error messages so that errors are placed in the alert text section. Updated wording in locale files to reflect the 160x160 file size.

updated dragonfly max logo height/width to 160px to fit with current max size of DMPRoadmap logo

Merge pull request #6 from DMPRoadmap/development ...

- Rails XSS patch
- pulling in organisation logo functionality
- cleaned up Gemfile

Merging current stable development branch into master (#23) ...

This is our unofficial v.0.1.0 release. It includes:
- Rails 4.2 migration
- Internationalization
- API
- Institutional logo upload (thanks to Weiwei and the Univ. of Alberta)
- Generic branding
- General cleanup of code and bug fixes

Moved sass-rails and less-rails gems back into global gem list in gemfile

switched asset pipeline conf

updated authorization for all controllers ...

-changed from passing through records as feature not supported
-changed 403 error to better reflect what's happening
-added scope to many of the indexes
-added organisation-scope to requests from old org-admin roles
-renamed guidance_groups_policy to guidance_group_policy.rb

changed empty? to blank? as it broke seedfile

Merge pull request #3 from raycarrick-ed/master ...

change how questions are displayed in plans to honour formatting

Added missing less file to asset precompilation

fixed merge conflicts in Gemfile and Schema.rb

Reorganized gemfile and commented out unused gems

fixed merge conflicts with fr and de locale files

Fixed issue with link to the terms page in the 'I accept the terms and conditions' link in the sign up section. The link is a part of the locale file, so created a variable called current_locale

added default redirect to 403 page for unauth

added pundit auth to dmptemplates controller

added pundit auth to guidance groups

added pundit auth to guidances

bugfix to ensure organisations auth working

removed depricated controller

added pundit auth to organisations controller

added pundit to users controller

change how questions are displayed in plans to honour formatting

added pundit authorization to users

proof of concept for pundit ...

-got the pundit policy file working
-verified that it blocked/allowed users with correct permissions
-fixed a bug in user model where the magic strings had been poorly defined
-

fixed merge conflict with schema.rb

Merge branch 'ualbertalib-organisation_admin_upload_logo' into development