Final commit after builds
Merge branch 'master' of https://github.com/kissync/kissync-python

Conflicts:
	bottompanel.py
	smartfile/__init__.pyc