Moved db interactions to the server
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/misc.xml
	.idea/uvacs3240-g11.iml
	FinalOneDir/Controllers/Client/ClientFileDaemon.py
	FinalOneDir/Controllers/Client/Controller.py
	FinalOneDir/Database/temp.db
	FinalOneDir/FinalOneDir/settings.py
	FinalOneDir/OneDirClient.py
	FinalOneDir/OneDirServer.py
	FinalOneDir/c_controller.log
	FinalOneDir/s_controller.log
Recovered data lost to conflict from previous merge