up
up
Merge branch 'master' of https://github.com/alexcazacu/file_sharing2.0

Conflicts:
	backend/client.pyc
	backend/settings.py
	backend/settings.pyc
	interfata/connections_list.pyc