Merge remote-tracking branch 'origin/kameleon' into properties

This commit is contained in:
Alexander Bock
2014-05-02 16:59:50 +02:00
28 changed files with 806 additions and 105 deletions