adding the ability to filter ajax file requests
(cherry picked from commit 285b7ba5370e0d29a89dc80c54d41c59fe9e9b8a)
adding support for template tags
Split out the functionality of cms_page_content.

cms_page_content was very slow when due to having to determine the type
of content it was tasked with retrieving. Furthermore, the method would
behave differently based on what content was being fetched.

Since the method method behaves differently based on the content being
fetched, it was required that the caller know what type of content it
was expecting. As such, it wasn't much of a stretch to split the method
into two distinct methods.

Change-Id: I342381ff863e17529659dba7ba9148d81368b18d
Merge pull request #337 from freerunningtechnologies/master

Split out the functionality of cms_page_content.
Merge branch 'master' of git://github.com/greenriver/comfortable-mexican-sofa into greenriver-master

Conflicts:
	lib/comfortable_mexican_sofa/view_methods.rb
	test/models/view_methods_test.rb
Merge pull request #334 from manishgkasera/master

adding support for template tags
Allow pre-setting snippet values from URL

This allows pre-setting snippet values from edit URL.
(my use case: pre-fill mirrored snippets that are created with no content).

Note that `attributes=` merges attributes (despite what `=` might suggest)
(cherry picked from commit cad18890e5f4ac29e3bfa5d7cb770b699ab129d7)
cleaning up a bit
Added syntax highlighting to the Gemfile entries.
Check #blocks_attributes_changed when importing pages.
Merge pull request #338 from parndt/patch-1

Added syntax highlighting to the Gemfile entries.
Merge pull request #339 from jalada/master

Check #blocks_attributes_changed when importing pages.
auto select url text

- read only input
forcing text/html content_type for preview action

(cherry picked from commit a9034f41017d8c660223c80afa16e9aa888cfac7)
Bump to 1.8.5
Bump to 1.9.2
page content caching doesn't need to happen on save. accessing nil content triggers fresh page render
changing pull_path doesn't trigger content re-render
base class for models
using relative protocol