Added protokoll 20141124
Merge branch 'master' of github.com:ultralaserdeluxe/gloria