Mergei old branch 'master' into paste_view

Conflicts:
	requirements.txt
	src/apps/pastes/views.py
	src/templates/pastes/paste.html