Release 0.4.10.4
Merge remote-tracking branch 'upstream/master'

Conflicts:
	templates/pages/index.html
Merge pull request #4 from proller/master

Release 0.4.10.4