complete static branch merge
Merge branch 'master' of https://github.com/StudentLifeMarketingAndDesign/student-life-at-iowa

Conflicts:
	themes/studentlife/css/master.css
	themes/studentlife/css/master.css.map
	themes/studentlife/templates/Includes/Byline.ss
	themes/studentlife/templates/Layout/MemberPage.ss
	themes/studentlife/templates/Layout/NewsEntry.ss