Referat 1-11-13
Merge branch 'origin/master'