add landing page
Merge remote-tracking branch 'origin/master'

Conflicts:
	themes/bootstrap/css/styles.css
add landing page