Removed tests directory (leaving it on the tests branch).
Merge branch 'master' into tests

Conflicts:
	syncserver/tests/*