commented out old ajax endpoints on projects controller

removed debug lines and added comments

finished up removal of ajax calls from create plan page

further changes for create plan de-ajax-ing

Removed ajax calls in create project/plan page. It now passes all of the options to the UI and lets the UI filter them as needed. Also upgraded the select2.js script to the lates 4.x version

Merged branding changes from the development branch into the master branch that now contains DCC's changes to permissions/roles, internationalization and bug fixes

merged DCC changes into master

added ability to grant permissions to other users

overhaul of performance of users admin-index

added new permissions to api

removed cancancan and rollify

implimenting auth changes in the views

Branding changes (#24) ...

- Removed the description field from organisation
- Added a contact email field to organization
- Added an email address validator
- Updated organisation logo upload so that the system will resize the image to the correct height rather than forcing the user to provide a 100x100 image
- Change how the organisation logo is displayed 

* 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.

* removed height and width constraints to logo upload function. Added method that will resize the uploaded logo so that the width is 160px (maintaining aspect ratio) so that the logo fits within the layout properly

* changed logo size to a height of 100 and moved logo so that it appears alongside the DMPRoadmap logo per the current specifications

* Removed description field from organisation. Add contact email to the organisation. Change the way the logo is displayed on the organisation screen.

bugfixes to auth

finished implimenting new authorization scheme in dmptemplates

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

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

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
-

installed new gem pundit

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

fixed merge conflict with schema.rb

fixed merge conflict in schema.rb