moving tests again
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Client/.project
Documentation
Merge remote-tracking branch 'upstream/master'
Deleting test-folder
Merge pull request #16 from uipo/master

Deleting test-folder