merge merge merge....
Added website and logo to group
more merging
bug fix for PDF Format export
Continuation of merge