Merge branch 'release/0.2' into develop
fixed some colors, fixed 'back to top' links
Merge branch 'develop' into hotfix/line_spacing

Conflicts:
	assets/css/styles.css
	assets/css/styles.css.scss
	index.html