added admin capabilities to view sync history, user information, and file information
Merge remote-tracking branch 'origin/master'

Conflicts:
	Client.py