removed debug lines and added comments

finished up removal of ajax calls from create plan page

further changes for create plan de-ajax-ing

updated json for guidance_groups so that the organisation id is included for filtering purposes

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

commented out legacy user.organisation_id method in user model. Each user now belongs to one organisation

Merge pull request #8 from DMPRoadmap/master ...

bug fix and gemfile.lock rebuild

Fixed bug in logo branding view

fixed merge conflicts

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

more merge conflicts

added ability to grant permissions to other users

fixed a bug where users' api_tokens would display if they had none

overhaul of performance of users admin-index

implimenting auth changes in the views

fixed merge conflicts

added ability to grant permissions to other users

fixed a bug where users' api_tokens would display if they had none

overhaul of performance of users admin-index

implimenting auth changes in the views

fix various issues to do with display of formatting in questions

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.

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

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

implimenting auth changes in the views

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

bullet lists for questions

explicit bullet style for questions and raw questoin test in form

removed depricated controller

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.