Merge branch 'refs/heads/develop'

Signed-off-by: Marcus Scheller <me@marcusscheller.com>

Conflicts:
	html/css/styles.scss