Merge branch 'master' into PicTransferServer

Conflicts:
	picturetransfer/views.py
	webinterface/views.py