-  Markdown styling finished
Merge branch 'develop' of https://github.com/frnhr/miniprint into develop
include markup; report checkbox
- UploadView and ProfileView added
Merge branch 'develop' of https://github.com/frnhr/miniprint into develop

Conflicts:
	miniprint/settings_local_empty.py
Added search results
voting
vote on chunks
popup with document, great success
popup body class
Merge branch 'feature/document_public_view' into develop
fix template condition
show me ids in the admin
score colors
Merge branch 'develop' of https://github.com/frnhr/miniprint into develop

Conflicts:
	web/static/web/css/main.css
	web/templates/web/main.html
	web/urls.py
	web/views.py
Merge branch 'develop' into feature/document_parser
some left out migration
upload page css tweaks
Added commenting
form validation