Merge pull request #2 from competence-plus/master

Update
Merge pull request #2 from competence-plus/master

Update
Merge pull request #10 from Absences-cplus/master

Merge pull request #2 from competence-plus/master
Merge pull request #11 from configuration-cplus/master

Merge pull request #2 from competence-plus/master
Merge remote-tracking branch 'upstream/master'