Merge branch 'release/v0.6'

* release/v0.6:
  updated TODO
  made sure import was admin only for assets too
  made sure that only admin can access import
  fixed issue where admin toggle did not show
  added csv support for testing
  added ability to import existing users and assets from the old system
  added TODO list
  added iconv as a require so that roo will work properly
  reverted to 1.9.x
  fixed indentation, configured for both user and asset import at route level
  updated pdf to make it more readable and official looking
  cleaned up routes.rb and added import to users resource
  Updated to rails 3.2.13
  added admin toggle so only initial admin user has to be manually set, allowed for admin users to edit existing users so that admin rights can be granted
  removed potential conflict with PDF mimetype
  Set console to use pry instead or irb during development
  installed Gems for 2.0.0
  updated gemfile to work with ruby 2.0.0-p0
Merge branch 'release/v1.0'

* release/v1.0:
  added relevant environment variables and instructions to the readme to suit usage by other companies
  updated readme to include blueprint and bootstrap attributation, updated prawn pdf to remove logo
  removed public/assets
  added public/assets to gitignore
  Creation of IE sheet and removal of dependency on datepicker
Merge branch 'release/v1.0-fix'

* release/v1.0-fix:
  fixed a typo in the readme
Merge branch 'release/1.1'

* release/1.1:
  updated todo
  Secret token is now an enviroment variable
  changed name on about page to also be an environment variable
  made parts of the help page environment variable
  converted remaining views to haml using rake task
  created rake task to convert remaining files
  started HAML conversion
Merge branch 'release/v1.2'

* release/v1.2:
  further environment variables
  refactored to store logic in helper rather than view
  removed empty helpers
  law of demeter fixes
  trailing whitespace removal from dev generated files
  tidied up lots of trailing whitespace
  tidied up the way buttons are displayed on the index
  finally added the mailer testing that I forgot before
  fixed some issues with existing specs
  tidied up the mail view for signups
  fixed typo in password reset page
  more env variables for the mailer components
Merge branch 'release/v1.2.1'

* release/v1.2.1:
  added ruby version to gemfile so that roo will still work
Merge branch 'release/v1.2.2'

* release/v1.2.2:
  fixed stupid mistake in production.rb
Merge branch 'release/v1.2.3'

* release/v1.2.3:
  fixed stupid mistake in production.rb
Merge branch 'release/v1.2.3b'

* release/v1.2.3b:
  revert change
Merge branch 'release/v1.2.3c'

* release/v1.2.3c:
  updated details
Merge branch 'release/v1.2.3d'

* release/v1.2.3d:
  reverted changes that broke capistrano
Merge branch 'release/v1.2.3e'

* release/v1.2.3e:
  fixed some issues with deploy.rb
Merge branch 'release/v1.2.3f'

* release/v1.2.3f:
  fixed some issues with deploy.rb
Merge branch 'release/v1.2.3g'

* release/v1.2.3g:
  fixed some issues with deploy.rb
Merge branch 'release/v1.2.4'

* release/v1.2.4:
  pointed deploy back at master branch
  updated a couple of environment variables
  reconfigured some recipes due to issues, added additional stylesheets to precompile
  some capistrano fixes
  some capistrano fixes
  some capistrano fixes
added an environment variable to the flash on create and updated the destroy flash to be more serious

(cherry picked from commit 24b5bf85a8576c15983621de823ca7adad151c6a)
Merge branch 'release/public-release'

* release/public-release:
  changed server address
  updated version of postgres
  Update LICENSE
  Create LICENSE
  added an environment variable to the flash on create and updated the destroy flash to be more serious
Merge branch 'release/public-2'

* release/public-2:
  no longer show user email on show page
  reverted postgresql version
Merge branch 'release/public-3'

* release/public-3:
  more env variables
better asset form, company agnostic sample users