modified:   client/Gruntfile.js
	deleted:    client/test/e2e/conf.js
	renamed:    client/test/unit/karma.conf.js -> client/test/karma.conf.js
	renamed:    client/test/e2e/conf2.js -> client/test/protractor.conf.js