Bogus Commit
Merge branch 'master' of https://github.com/kissync/kissync-python

Conflicts:
	main.py
	requests/__init__.pyc
	requests/adapters.pyc
	requests/api.pyc
	requests/auth.pyc
	requests/certs.pyc
	requests/compat.pyc
	requests/cookies.pyc
	requests/exceptions.pyc
	requests/hooks.pyc
	requests/models.pyc
	requests/packages/__init__.pyc
	requests/packages/charade/__init__.pyc
	requests/packages/urllib3/__init__.pyc
	requests/packages/urllib3/_collections.pyc
	requests/packages/urllib3/connectionpool.pyc
	requests/packages/urllib3/exceptions.pyc
	requests/packages/urllib3/filepost.pyc
	requests/packages/urllib3/packages/__init__.pyc
	requests/packages/urllib3/packages/ordered_dict.pyc
	requests/packages/urllib3/packages/six.pyc
	requests/packages/urllib3/packages/ssl_match_hostname/__init__.pyc
	requests/packages/urllib3/poolmanager.pyc
	requests/packages/urllib3/request.pyc
	requests/packages/urllib3/response.pyc
	requests/packages/urllib3/util.pyc
	requests/sessions.pyc
	requests/status_codes.pyc
	requests/structures.pyc
	requests/utils.pyc
	smartfile/errors.pyc
Added Usermanagement Button and Window... Got API call to work to populate combo box within usermanagementwidget.py
Merge branch 'master' of https://github.com/kissync/kissync-python

Conflicts:
	requests/packages/charade/big5freq.pyc
	requests/packages/charade/big5prober.pyc
	requests/packages/charade/chardistribution.pyc
	requests/packages/charade/charsetgroupprober.pyc
	requests/packages/charade/charsetprober.pyc
	requests/packages/charade/codingstatemachine.pyc
	requests/packages/charade/compat.pyc
	requests/packages/charade/constants.pyc
	requests/packages/charade/escprober.pyc
	requests/packages/charade/escsm.pyc
	requests/packages/charade/eucjpprober.pyc
	requests/packages/charade/euckrfreq.pyc
	requests/packages/charade/euckrprober.pyc
	requests/packages/charade/euctwfreq.pyc
	requests/packages/charade/euctwprober.pyc
	requests/packages/charade/gb2312freq.pyc
	requests/packages/charade/gb2312prober.pyc
	requests/packages/charade/hebrewprober.pyc
	requests/packages/charade/jisfreq.pyc
	requests/packages/charade/jpcntx.pyc
	requests/packages/charade/langbulgarianmodel.pyc
	requests/packages/charade/langcyrillicmodel.pyc
	requests/packages/charade/langgreekmodel.pyc
	requests/packages/charade/langhebrewmodel.pyc
	requests/packages/charade/langhungarianmodel.pyc
	requests/packages/charade/langthaimodel.pyc
	requests/packages/charade/latin1prober.pyc
	requests/packages/charade/mbcharsetprober.pyc
	requests/packages/charade/mbcsgroupprober.pyc
	requests/packages/charade/mbcssm.pyc
	requests/packages/charade/sbcharsetprober.pyc
	requests/packages/charade/sbcsgroupprober.pyc
	requests/packages/charade/sjisprober.pyc
	requests/packages/charade/universaldetector.pyc
	requests/packages/charade/utf8prober.pyc