Merge pull request #1 from Bjschulze/master

thanks
Updated Site to Version 1.1
Updated Site to Version 1.2
bla
Merge remote-tracking branch 'upstream/master'