Add Carrierwave and create first media file uploader
Add MediaFile model and attach CarrierWave to it
Add media files controller
Add ability to create a new media file
Add media file updating and deleting
Configure Amazon S3 support for file uploads
Merge branch 'master' into add_media_file_management

Conflicts:
	.gitignore
	Gemfile.lock
	README.md
	lib/sevenpages/engine.rb
	sevenpages.gemspec
Ignore test uploads
Tidy up CarrierWave configuration
MediaFile enhancements
* Add Title column
* Restrict to only image types
* Display Title and shortcode link on index page
* Test replacing images
Create thumbnail version of MediaFile
grammar consistency
Add Liquid tag to generate image tag
Merge branch 'master' into add_media_file_management

Conflicts:
	README.md
Add indexes for MediaFile and Page
Fix short-code link