Merge branch 'master' of https://github.com/MidwestPHP/mwphp15 into jmw-dev

Conflicts:
	source/index.html.twig
Merge branch 'master' of https://github.com/MidwestPHP/mwphp15 into jmw-dev

Conflicts:
	source/index.html.twig
Merge remote-tracking branch 'origin/jmw-dev' into jmw-dev

Conflicts:
	source/index.html.twig
	source/sponsors.html.twig