stuff
Merge branch 'develop' of https://github.com/frnhr/miniprint into develop

Conflicts:
	web/templates/web/index.html