Picture/Event/App update

content update
Merge branch 'master' of https://github.com/SEMAdevelopment/website

Conflicts:
	app/views/home/index.html.slim
	app/views/layouts/application.html.slim
	app/views/pages/apps.html.slim
update