fixed the problem?
updated view spec for documents/show with stub_model for version
Merge pull request #206 from tochman/develop

Fix for mailer.rb
-qmMerge branch 'develop' of https://github.com/AgileVentures/WebsiteOne into doc_version_control_clean
added word ago to revisions. All cukes and rspec passing. Ready for a PR
Merge pull request #207 from decareano/doc_version_control_clean

Adding version control to documents.
added document metadata helper method. Fallback for enmpty Document.versions
Merge pull request #208 from tochman/doc_version_control_clean

Fix for Document version control
Merge pull request #209 from AgileVentures/develop

Deploying to Documents VC to Staging
added events and events_instances model. Added migration for model
writing cukes and implemented controllers for events and event instances. Added some views
merging with Thomas
added airpair logo, spaced them out
added code climate logo
added images to public/asset directory
updated user index view
schema
Merge branch 'develop' into sponsors

Conflicts:
	app/views/layouts/_sidebar.html.erb
	app/views/layouts/application.html.erb
	app/views/layouts/with_sidebar.html.erb
	app/views/pages/about-us.html.erb
	app/views/pages/getting-started.html.erb
	app/views/pages/guides.html.erb
	app/views/users/index.html.erb
returned projects to full width
fixed visitor project page