event & advisory board teaser blocks
bug fixes
Merge branch 'develop' of https://github.com/kdee15/astd into develop

Conflicts:
	assets/css/Stylesheet.css
Merge branch 'develop' into css_fixes

Conflicts:
	assets/css/Stylesheet.css