fixed Users menu item missing when refactoring

started the migration from i18n to gettext

merge in changes from origin

first port of plan creation and editing to new data model

resolved merge conflicts

merged final_schema changes into visibility

fixed merge conflicts

extracted plan visibility work out of dev branch for PR to DCC

hacked templates landing page to work

changes to _navigation partial to allow org_admin to render correctly

updated user model to allow signin_signout to detect permissions(admin/orgadmin)

finsihed adding visibility to project details page as radio button options. Updated public DMPs page to work with new visibility and moved it to the static pages controller since it falls outside of normal security. Updated all locale files accordingly

worked on routing and controller tests for new public dmps. Fixed routing tests so that they use rails route helpers

Added initial public DMPs page to display public plans to unauthenticated users

updates so that a user can log into the site \n updated application_controller, user model, registrations edit view, and layouts branding

get rid of explcit urls in admin/superadmin links

removed commented out code from new branding changes

renamed layout partials to remove reference to dmponline. Updated configurations so that the code default assets are stored in lib/assets and any instance specific versions would be stored within app/assets. Move static page content out of the large locales files and placed examples of them into config/locales/static_pages

merge postgresql -> master

updated passwords controller to redirect user to the main landing page after initiating a password reset. Removed reference to invalid spinner css from main layout file

translation no longer breaks on header link to create plan

Fixed issues with modal dialog functionality when trying to edit a published template

fixed issue with missing organisation_id for current user

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

Fixed bug in logo branding view

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

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.

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