Fixed merge conflicts API/I18n -> Rails 4.2

Merged conflicts

merge

Removed some debug statements

Fixed issues with settings hash

Fixes to the plan settings page

Removed outdated i%() array initializers because they now create arrays of symbols instead of strings

Added 'self' prefix to dmptemplate references in models/project.rb because of a scoping issue. tweaks to select2 dropdowns on create project page

ensured that users recieve emails about their new tokens upon token being granted

language table, dropdown, additional locales

fixed methods for removing and generating user tokens

Removed all accepts_nested_attributes_for for belongs_to associations because they were creating circular calls in ActiveRecord.

added functions for removing and generating api tokens from the user model

Fixed stack too deep error by commenting out circular reference to sections in the version model. Changed deprecated '.find(:all, :order => 'field ASC')' format to '.all.order('field')'

localization further work, including dropdown initial work

deleteing user's api tokens if they switch organisations

added yard documentation, bugfixed method, fixed bug where relationship with users was broken

updated yard commits

added yard comments and bugfixed methods

removed token_permissions from models

removed outdated token_permission construct

fixed typo

added documentation to guidance_group model

changed can_view to can_view? as it returns a bool

re-wrote by_organisation to be more efficient (also to work)

added discussion point to dmptemplate

added documentation to guidance model

Added documentation and fixed syntax to dmptemplate model

fixed bug where users couldn see their organisations' guidance groups

ensured can_view behaves as intended/defined by tests