Merge pull request #557 from naturwerk/akaelin

Merge pull request #556 from naturwerk/master
Merge pull request #558 from naturwerk/akaelin

performance bug fixed with acl check!
Merge pull request #559 from naturwerk/akaelin

delete adjusted (foreign key constraints)
Merge pull request #560 from naturwerk/akaelin

image delete adjusted (foreign key constraint)
Merge pull request #561 from naturwerk/akaelin

bug fixed (foreign constraint by deletion)
Merge pull request #562 from naturwerk/akaelin

.on not working, commented out script
Merge pull request #563 from naturwerk/master

back to master