Merge branch 'introduction-page' into content

Conflicts:
	app/images/introduction.jpg