add a safer html sanitizing, used clean_html in markdown rendering
Merge remote-tracking branch 'upstream/develop' into security-update
fixed bug with rendering code blocks
updated articles helper to fix problem with nil language, added test to support changes
Revert "Removed notifications"

This reverts commit 37d1ea5e50ae23773ce18c969d36ec32492a9919.
Merge remote-tracking branch 'upstream/develop' into security-update

* upstream/develop:
  fix for coveralls?
  small updates to view spec and method
  Update README.md
  added specs to 'visitors/index' and scenario to 'features/event_countdown' to check for '-1h' when event is planned within 23h. Changed the 'distance_to' method in 'datetme_extension.rb'
Merge pull request #322 from yggie/security-update

Security Update
Merge pull request #331 from sampritipanda/refactoring

Improving Coverage for WebsiteOne
Merge branch 'develop' of https://github.com/AgileVentures/WebsiteOne into develop