Code organization updates
Merge branch 'master' of https://github.com/kissync/kissync-python

Conflicts:
	filedatabase.py