update h1 and intro text
Merge branch 'basic-theming' into develop

Conflicts:
	app/assets/stylesheets/core.css
Merge branch 'develop' into hotfix-0.1
Merge branch 'hotfix-0.1'
fix broken background path
Merge branch 'hotfix-0.2'