added clientID
Merge branch 'Perfect-master'
Merge branch 'Perfect-master' into Tobias
Merge branch 'Tobias'
Databas update
Merge remote-tracking branch 'origin/master' into Anna
Merge branch 'Anna' of https://github.com/essob/Client1 into Anna