Refinements
Merge branch 'refs/heads/master' into gh-pages

Conflicts:
	assets/css/app.css
	assets/js/app.js
	tasks/settings.json
	templates/index.html