master used as a branch :)
We can remove the GPL stuff now (Faenza)... Thanks rasterman...Minor tweaking to be done with a couple of the icons
Also add user names -> id