Signed-off-by: unknown <CPVR@HTIBIN332-006.bfh.ch>
Signed-off-by: mania54 <aledelpiero@gmx.ch>
Merge branch 'master' of github.com:bfh/passerelle-informatik-2014