changed test handling
Merge branch 'master' of github.com:tobiastry/Photoapp

Conflicts:
	Server/package.json