Updated resolve/refinerycms -> refinery/refinerycms
Allow extra parameters to be passed when creating image.
Remove template that appears leftover from namespacing updates.
resolving deprecation errrors
Add help to refinerycms command. #1538, #1539.
Allows the help command to access the CMS generator when running as a gem or running in development mode and included option aliases.
Place UTF-8 encoding magic comments in initializer templates.

So that UTF-8 characters can be used in settings.
Add note to changelog about #1931.
In page seeds update slug for each page separately instead of using
update_all because otherwise it fails when using mysql. Fixes #1919.

Conflicts:
	pages/db/seeds.rb
Updated changelog and made gemspecs consistent to prepare for 2.0.9
Fix selected class for locale picker
Fix spanish traslation
We don't run cucumber anymore.
Added 'end' statement to end of sessions_controllers.rb sample code
Don't run file merge commands in extension/form generators when
--pretend option is present.

When --pretend option is present no files are being actually created
so when extension/form generator tries to merge locales, seeds etc.
it fails because needed files doesn't exist.
Add changelog note about #1916.
Fix problem with escaped quotes in html attributes and refactor quotes
by convention.
Update doc/guides/7 - Hosting and Deployment/2 - Amazon S3 for Uploads.textile

For some reason I had to configure my credential that way to solve this exact issue:
https://github.com/refinery/refinerycms/issues/1278
Update doc/guides/2 - Refinery Basics/5 - Overriding javascripts.textile

javascript_include_tag exists, javascript_link_tag does not.
refactoring quotes and add .html_safe where is necessary

Conflicts:
	images/app/views/refinery/admin/images/_form.html.erb
	images/app/views/refinery/admin/images/_records.html.erb
	images/app/views/refinery/admin/images/insert.html.erb