Merge pull request #17 from lg-hslu/master

sync branches
Merge branch 'master' of http://github.com/lg-hslu/lg-hslu.github.com
vorbereitet für Semester