Merge pull request #254 from AgileVentures/staging

Deploying to Production
Merge pull request #269 from AgileVentures/staging

Deploying to Production
Merge pull request #272 from AgileVentures/staging

Deploying css fix to production
Merge pull request #279 from AgileVentures/staging

Deploying to production
Merge pull request #282 from AgileVentures/staging

Deploying to Production
Merge pull request #294 from AgileVentures/staging

Deploying stories and fixes to Production
Merge pull request #300 from AgileVentures/staging

Deploying to Production
Merge pull request #303 from AgileVentures/staging

Deploying mailer fix to Production
Merge pull request #306 from AgileVentures/staging

Pushing revert fix code to Production
added check for nil input to markdown rendering, added tests for nil input
wrapped CodeRay.scan(...).div in a begin-rescue statement, create markdown engine on the fly
added test for the weird locale missing issue
Merge branch 'master' of https://github.com/AgileVentures/WebsiteOne

Conflicts:
	app/helpers/articles_helper.rb
	spec/helpers/articles_helper_spec.rb
Removed notifications
Revert "Removed notifications"

This reverts commit 37d1ea5e50ae23773ce18c969d36ec32492a9919.
Merge branch 'master' of https://github.com/AgileVentures/WebsiteOne
Merge branch 'master' of https://github.com/AgileVentures/WebsiteOne
Merge branch 'master' of https://github.com/AgileVentures/WebsiteOne
Merge branch 'master' of https://github.com/AgileVentures/WebsiteOne
Merge branch 'master' of https://github.com/AgileVentures/WebsiteOne