thumbs
Merge branch 'database' of github.com:utwente-di/di18 into Tests

Conflicts:
	ThinkTank/src/main/webapp/files/Thumbs.db
	ThinkTank/src/main/webapp/images/Thumbs.db
Fixed problems in TestUser