Removed superfluous includes (closes #3499)
Delete complete div onclick even if error message (closes #2561)
Change error message for local missing (closes #2450)
Merge pull request #607 from eguaj/3.2-A3499

Removed superfluous includes (closes #3499)
Merge pull request #610 from thingthing/3.2-I2561

Delete complete div onclick even if error message (closes #2561)
Merge pull request #611 from thingthing/3.2-I2450

Change error message for local missing (closes #2450)