js
image updates
building homepage
events blocks
Merge branch 'develop' into css_fixes

* develop:
  events blocks
  building homepage
  image updates
  js

Conflicts:
	assets/css/Stylesheet.css
	assets/images/svg/bg-conference.svg