Trying to fix travis config file bugs.
Fixed travis config database name error.
Removed redundant 'create database' command for psql in the Travis config.
Cleaned up library class loading and fixed bug with DynamicRouter running before the database is generated. TRAD-22 GR-4 #1h Fixing bugs
Added dependency injection back into the environment config - not sure this is the best way, must revise.
Moved redactor function call to the relevant redactor js asset.
Trying to make the delivery service price code more unique.
Added delivery page seed, fixed redactor so it works alongside turbolinks, stopped redactor from replacing div tags with p tags and cleaned the pages slug attribute. TRAD-22 GR-4 #time 1h Cleaning up the code
Removed redundant highline gem.
Bundled gems.
Removed highline require reference.
Updated sitemap to facilitate the new pages functionality. TRAD-22 GR-4 #time Updated sitemap
Updated and fixed bugs in soca theme.
Modified the redactor RTE store directory so it utilises Amazon S3 with Carrierwave for production uploads. TRAD-22 GR-4 #time 20m Fixing redactor uploads
Updated soca assets for new style design and added storefront button to admin sidebar. TRAD-25 #time 10m Finished dev
Removed all CRUD functionality associated with countries and set up country seeds for the trado installation script. TRAD-24 #time 30m Removed countries from admin
Removed iso and language attributes from country factory.
Cleaned up the zone index to facilitate for the changes in the country administration. TRAD-24 #time Cleaning up
Fixed zones feature specs to reflect new index view layout. TRAD-24 #time 15m Fixing specs
Merge branch 'master' into table-actions

Conflicts:
	app/views/admin/zones/countries/index.html.haml
	app/views/admin/zones/index.html.haml