Stuff
Merge branch '7.x-1.x' of github.com:konzilo/drupal-konzilo into 7.x-1.x