Merge origin/master

Conflicts:
	views/document.py